summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-02-02 00:12:55 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-02 02:02:20 -0800
commitbf1c32bdec8223785c779779d0a660a099f69a63 (patch)
tree2e78720acf55e2a509f65a8f8c2093b874a552ae /csum-file.c
parentcombine-diff: reuse diff from the same blob. (diff)
downloadtgif-bf1c32bdec8223785c779779d0a660a099f69a63.tar.xz
combine-diff: update --cc "uninteresting hunks" logic.
Earlier logic was discarding hunks that has difference from only one parent or the same difference from all but one parent. This changes it to check if the differences on all lines are from the same sets of parents. This discards more uninteresting hunks and seems to match expectations more naturally. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions