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