diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-05 19:09:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-05 19:09:05 -0400 |
| commit | 59cfb9b6d0f5f60516d17c79365318711a92fb04 (patch) | |
| tree | 388f7376e07140dd88a3dcc0aaa2ac909776e5d1 /debian | |
| parent | 9989114c1f662ddbdf3970be7324c97d0f59c9e5 (diff) | |
| download | ikiwiki-59cfb9b6d0f5f60516d17c79365318711a92fb04.tar ikiwiki-59cfb9b6d0f5f60516d17c79365318711a92fb04.tar.gz | |
only_committed_changes could fail in a git repository merged with git merge -s ours.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d91342595..0c36baf60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20140228) UNRELEASED; urgency=medium + + * only_committed_changes could fail in a git repository merged + with git merge -s ours. + + -- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2014 19:08:22 -0400 + ikiwiki (3.20140227) unstable; urgency=medium * Added useragent config setting. Closes: #737121 |