xmerge: make return value from xdl_merge() more usable.
authorJunio C Hamano <junkio@cox.net>
Wed, 29 Nov 2006 20:06:49 +0000 (12:06 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 01:28:19 +0000 (17:28 -0800)
commit53a7085...104936aef29400369aab15e0d1ccbb28
tree8a37aa9...56fbd7fd50559ed5cb28099ef9461935copy hash to clipboard (tree)
parent857b933...04bc21ce02043c3107c148f8dcbb4a01copy hash to clipboard (diff)
xdiff/xmerge.c