diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-10-15 14:22:46 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-10-15 14:22:46 -0400 |
commit | cb5ca6e981a9dedce90d9ac7e1785c5ae5841723 (patch) | |
tree | d0a926ff1776c7a242a111b72afe76455fc77bdb /Utility/Applicative.hs | |
parent | 4b6bff79f25d5567deb8b266cccb96744f75d057 (diff) |
avoid making post-merge-conflict-resolution commit when no conflicts were resolved
sync, merge, assistant: When git merge failed for a reason other than a
conflicted merge, such as a crippled filesystem not allowing particular
characters in filenames, git-annex would make a merge commit that could
omit such files or otherwise be bad. Fixed by aborting the whole merge
process when git merge fails for any reason other than a merge conflict.
Diffstat (limited to 'Utility/Applicative.hs')
0 files changed, 0 insertions, 0 deletions