merge-recur: Fix compiler warning with -pedantic
commit7b3f5daabc9fcfffc632a6a963cf5466745b7dbd
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Thu, 27 Jul 2006 17:13:24 +0000 (27 19:13 +0200)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 02:39:15 +0000 (27 19:39 -0700)
tree38e9c7918d0e034fc6e65f2c912e74ee610458b0
parent5d3afe05d9466a8472be315793dfc08594b1e9c4
merge-recur: Fix compiler warning with -pedantic

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c