summaryrefslogtreecommitdiff
path: root/git-merge-fredrik.py
AgeCommit message (Expand)AuthorFilesLines
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano1-0/+426