![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Feb 2006 09:28:08 +0000 (01:28 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 2 Feb 2006 10:02:20 +0000 (02:02 -0800) | ||
| commit | fd4b1d2193640009c9303daa784691fc5e102018 | |
| tree | a238aa3d7f3be2b922de350b46667a9bfd6dae5d | tree | snapshot |
| parent | bf1c32bdec8223785c779779d0a660a099f69a63 | commit | diff |
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>
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>
| combine-diff.c | diff | blob | history |