xdl_merge(): fix thinko
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 29 Nov 2006 23:25:11 +0000 (00:25 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 01:28:19 +0000 (17:28 -0800)
commit710daa8...fc76f79b8f2ee9a765d297187c2c1aeb
tree9e3e180...7e83977b4f5df6c7057d7d17a1a672e3copy hash to clipboard (tree)
parent875b8ce...7650d712c8f464cfedb9147673fe3ff7copy hash to clipboard (diff)
xdiff/xmerge.c