]> git.ipfire.org Git - thirdparty/git.git/commit - xdiff/xmerge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 857b933) | patch
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)
commit53a7085a104936aef29400369aab15e0d1ccbb28
tree8a37aa9d56fbd7fd50559ed5cb28099ef9461935tree | snapshot
parent857b933e04bc21ce02043c3107c148f8dcbb4a01commit | diff
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>
xdiff/xmerge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.