xdl_merge(): fix and simplify conflict handling
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Tue, 5 Dec 2006 21:15:35 +0000 (22:15 +0100)
committerJunio C Hamano <junkio@cox.net>
Tue, 5 Dec 2006 21:30:22 +0000 (13:30 -0800)
commit98e6da8...360b77af2924e8056fd951013835699b
tree1748b10...970be2c41177c15187e9536e301a56f5copy hash to clipboard (tree)
parent710daa8...fc76f79b8f2ee9a765d297187c2c1aebcopy hash to clipboard (diff)
xdiff/xmerge.c