summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Tay Ray Chuan <rctay89@gmail.com>2011-08-01 12:20:08 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-08 13:00:17 -0700
commit19f7a9c57785161cdfaa6036eb0ef90853333724 (patch)
tree0fe95cec5f36d899c20e5048e858406858999841 /git-mergetool.sh
parentxdiff: do away with xdl_mmfile_next() (diff)
downloadtgif-19f7a9c57785161cdfaa6036eb0ef90853333724.tar.xz
xdiff/xhistogram: rework handling of recursed results
Previously we were over-complicating matters by trying to combine the recursed results. Now, terminate immediately if a recursive call failed and return its result. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions