summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
Commit message (Expand)AuthorAge
* add merge subcommandGravatar Joey Hess2011-06-22