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

resolvemerge: New plumbing command that runs the automatic merge conflict resolver.

Browse source
This commit is contained in:
Joey Hess 2014-07-11 16:45:18 -04:00
parent 003ebf58f5
commit cb66ca3a76
6 changed files with 60 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn
View file

@ -5,3 +5,5 @@ between local branches.
E.g., one might invoke «git annex merge» or «git annex autoresolve»
after «git merge» when conflicts are found.
> [[done]] as resolvemerge. --[[Joey]]