summaryrefslogtreecommitdiff
path: root/Command/ResolveMerge.hs
Commit message (Expand)AuthorAge
* showStart variant for when there's no worktree fileGravatar Joey Hess2017-11-28
* Avoid backtraces on expected failures when built with ghc 8; only use backtra...Gravatar Joey Hess2016-11-15
* fix auto merge conflict resolution when doing out of tree merge for adjusted ...Gravatar Joey Hess2016-04-06
* remove 163 lines of code without changing anything except importsGravatar Joey Hess2016-01-20
* convert all commands to work with optparse-applicativeGravatar Joey Hess2015-07-08
* started converting to use optparse-applicativeGravatar Joey Hess2015-07-08
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* 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 res...Gravatar Joey Hess2014-07-11