aboutsummaryrefslogtreecommitdiffstats
path: root/gitMergeCommon.py
AgeCommit message (Expand)AuthorFilesLines
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano1-0/+268