summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 975818366..86e833eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,10 @@ git-annex (5.20131102) UNRELEASED; urgency=low
* repair: Handle case where index file is corrupt, but all objects are ok.
* assistant: Notice on startup when the index file is corrupt, and
auto-repair.
+ * Fix direct mode merge bug when a direct mode file was deleted and replaced
+ with a directory. An ordering problem caused the directory to not get
+ created in this case.
+ Thanks to Tim for the test cases.
-- Joey Hess <joeyh@debian.org> Wed, 06 Nov 2013 16:14:14 -0400