Deprecate merge-recursive.py
authorJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 02:49:47 +0000 (19:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 03:33:35 +0000 (20:33 -0700)
commita06f678...b998862ea83b73e46ece32f99132935b
treed7604f0...f42a87ffbb4bc6eb8ebe8b5dc9adf0b5copy hash to clipboard (tree)
parent8391548...5e78677eb81f97334d998418802ea194copy hash to clipboard (diff)
.gitignore
Makefile
configure.ac
git-merge-recursive-old.py [new file with mode: 0755]
git-merge-recursive.py [deleted file]
git-merge.sh
git-rebase.sh
t/test-lib.sh