merge-recursive: fix rename handling
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Fri, 4 Aug 2006 16:21:41 +0000 (18:21 +0200)
committerJunio C Hamano <junkio@cox.net>
Fri, 4 Aug 2006 18:30:35 +0000 (11:30 -0700)
commit3d234d0...facd355eb30b330a56bd2efa73bd44d5
treec5c37ec...a8675bc1c8741a17b7abec07ab9c6bc0copy hash to clipboard (tree)
parentc8b87ef...b0da6b08a19ed4f98eb58f46748af1e9copy hash to clipboard (diff)
merge-recursive.c