aboutsummaryrefslogtreecommitdiff
path: root/git-merge-fredrik.py
Commit message (Expand)AuthorAge
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10