aboutsummaryrefslogtreecommitdiff
path: root/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn
Commit message (Expand)AuthorAge
* resolvemerge: New plumbing command that runs the automatic merge conflict res...Gravatar Joey Hess2014-07-11
* (no commit message)Gravatar zardoz2014-05-15