summaryrefslogtreecommitdiff
path: root/Git/Merge.hs
Commit message (Expand)AuthorAge
* typoGravatar Joey Hess2012-07-17
* avoid --no-edit with older git versionsGravatar Joey Hess2012-07-17
* sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23