summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 28090c450..353c5361d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ git-annex (5.20131231) UNRELEASED; urgency=medium
since this is used for password prompting.
* Avoid looping if long-running git cat-file or git hash-object crashes
and keeps crashing when restarted.
+ * Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.
-- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400