summaryrefslogtreecommitdiff
path: root/Git/Merge.hs
Commit message (Collapse)AuthorAge
* sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23