diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-02 00:12:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-02 02:02:20 -0800 |
| commit | bf1c32bdec8223785c779779d0a660a099f69a63 (patch) | |
| tree | 2e78720acf55e2a509f65a8f8c2093b874a552ae /git-merge-octopus.sh | |
| parent | combine-diff: reuse diff from the same blob. (diff) | |
| download | tgif-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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions