aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-31 16:39:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-31 16:39:11 -0400
commit54ba0564dba0e6a7a9c5de23488d419b8fb54c08 (patch)
tree6ded77a5351650778612f8aac9293e85cd3f7bc1 /debian
parent3d4b0c157e682a4827dd098d256a16d38fbe6d26 (diff)
Windows: Fix bug in direct mode merge code that could cause files in subdirectories to go missing.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b767d86b0..ff1e9a09f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
git-annex (5.20131231) UNRELEASED; urgency=medium
* external special remote protocol: Added GETUUID.
+ * Windows: Fix bug in direct mode merge code that could cause files
+ in subdirectories to go missing.
-- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400