[PATCH] Adjust git-merge-recursive.py for the new tool names.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 21:40:47 +0000 (23:40 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 22:45:25 +0000 (15:45 -0700)
commit87a71b6...acc10c4879b13d2030185e5640a087cd
tree54b59e2...b54ad90d7682b12f8474f5b10ac1eed9copy hash to clipboard (tree)
parent0d214b6...19bf14a6409a2a1ba079f3530d40ee41copy hash to clipboard (diff)
git-merge-recursive.py