diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
| commit | 2a727e8c5f8d003af7102ea7de22e45a5faec421 (patch) | |
| tree | 661d008aeb7f13c873c9afb7dcfa360aed60a528 /doc/todo | |
| parent | 64b74f4c616bd1aa42e7833b449586b64dac1ba5 (diff) | |
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn index 0224733c3..c2cf26f83 100644 --- a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn +++ b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn @@ -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]] |