diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-02 01:28:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-02 02:02:20 -0800 |
| commit | fd4b1d2193640009c9303daa784691fc5e102018 (patch) | |
| tree | a238aa3d7f3be2b922de350b46667a9bfd6dae5d /gitMergeCommon.py | |
| parent | combine-diff: update --cc "uninteresting hunks" logic. (diff) | |
| download | git-fd4b1d2193640009c9303daa784691fc5e102018.tar.gz git-fd4b1d2193640009c9303daa784691fc5e102018.zip | |
combine-diff: add safety check to --cc.
The earlier change implemented "only two version" check but
without checking if the change rewrites from all the parents.
This implements a check to make sure that a change introduced
by the merge from all the parents is caught to be interesting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions