summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
Commit message (Collapse)AuthorAge
* rename GitUnionMerge to Git.UnionMergeGravatar Joey Hess2011-06-30
Also, moved commit function into Git proper, it's not union merge specific.