aboutsummaryrefslogtreecommitdiff
path: root/git-merge-recursive-old.py
Commit message (Expand)AuthorAge
* Deprecate merge-recursive.pyJunio C Hamano2006-09-24