mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.

Browse source 
See http://git-annex.branchable.com/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/
This commit is contained in:
Joey Hess 2014-01-01 22:05:33 -04:00
parent 858eb26303
commit f83e5c75dc
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -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