summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
Commit message (Expand)AuthorAge
* rename GitUnionMerge to Git.UnionMergeGravatar Joey Hess2011-06-30