summaryrefslogtreecommitdiffstats
path: root/git-merge-recursive-old.py (follow)
Commit message (Expand)AuthorAgeFilesLines
* Deprecate merge-recursive.pyJunio C Hamano2006-09-251-0/+944