projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0e21a32) | patch
resolvemerge: Improve cleanup of cruft left in the working tree by a conflicted...
authorJoey Hess <joeyh@joeyh.name>
Mon, 7 Sep 2020 20:50:27 +0000 (16:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 7 Sep 2020 20:50:27 +0000 (16:50 -0400)
commit62372ee05242a5f984c38abb6b154d9d93ab12dc
tree613eb9508d87381cf44959dd56aef45db6703af4tree | snapshot
parent0e21a3221e93690d496f577baff5286e3e7673c0commit | diff
resolvemerge: Improve cleanup of cruft left in the working tree  by a conflicted merge

This commit was sponsored by Jake Vosloo on Patreon.
Annex/AutoMerge.hs diff | blob | history
CHANGELOG diff | blob | history
doc/bugs/automerge_leaves_cruft_behind.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.