summaryrefslogtreecommitdiff
path: root/xdiff/xdiffi.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-11-29 12:06:49 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-02 17:28:19 -0800
commit53a7085a104936aef29400369aab15e0d1ccbb28 (patch)
tree8a37aa9d56fbd7fd50559ed5cb28099ef9461935 /xdiff/xdiffi.h
parentxdiff: add xdl_merge() (diff)
downloadtgif-53a7085a104936aef29400369aab15e0d1ccbb28.tar.xz
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>
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions