diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 39ce9ca11..6d151ee08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ git-annex (5.20140708) UNRELEASED; urgency=medium * Fix git version that supported --no-gpg-sign. + * Fix bug in automatic merge conflict resolution, when one side is an + annexed symlink, and the other side is a non-annexed symlink. -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 |