| commit | 53a7085a104936aef29400369aab15e0d1ccbb28 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 29 Nov 2006 20:06:49 +0000 (29 12:06 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 3 Dec 2006 01:28:19 +0000 (2 17:28 -0800) | ||
| tree | 8a37aa9d56fbd7fd50559ed5cb28099ef9461935 | treesnapshot (tar.gz zip) |
| parent | 857b933e04bc21ce02043c3107c148f8dcbb4a01 | commitdiff |
xmerge: make return value from xdl_merge() more usable.
The callers would want to know if the resulting merge is clean;
do not discard that information away after calling xdl_do_merge().
Signed-off-by: Junio C Hamano <junkio@cox.net>
The callers would want to know if the resulting merge is clean;
do not discard that information away after calling xdl_do_merge().
Signed-off-by: Junio C Hamano <junkio@cox.net>
| xdiff/xmerge.c | diffblobblamehistory |