aboutsummaryrefslogtreecommitdiff
path: root/Command/ResolveMerge.hs
Commit message (Collapse)AuthorAge
* doh't use "def" for command definitions, it conflicts with Data.Default.defGravatar Joey Hess2014-10-14
|
* hlintGravatar Joey Hess2014-10-09
|
* resolvemerge: finish up by committingGravatar Joey Hess2014-07-11
|
* resolvemerge: New plumbing command that runs the automatic merge conflict ↵Gravatar Joey Hess2014-07-11
resolver.