| commit | 263eee29e94de935d62c7c4066fcea0ccfbe60b8 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Wed Jan 25 13:11:38 2006 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Sat Jan 28 00:08:29 2006 -0800 |
| tree | 3ef0d06f4f04fa4cafca6ff428eef7165a2d8691 | |
| parent | e228340961e0f48c6b818251bd4729b2d19647e4 [diff] |
combine-diff: extend --cc logic to Octopus. Santi Bejar points out that a hunk that changes from all the same common parents except one is uninteresting. The earlier round marked changes from only one parent uninteresting, but this also marks hunks that have the same change from all but one parent uninteresting, which is a natural extension of the original idea to Octopus merges. Signed-off-by: Junio C Hamano <junkio@cox.net>