diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-01 22:05:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-01 22:05:33 -0400 |
| commit | d45706bf3e81708269e2cd76eb3f84c6c24fe6a3 (patch) | |
| tree | 5816e16a3aa4ac125124d20d596e9d12e8705fa6 /debian | |
| parent | ae3837431df9404dc70e3a73855c25aa71d2b1de (diff) | |
Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
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 |