![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Feb 2006 02:54:08 +0000 (18:54 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Feb 2006 02:54:08 +0000 (18:54 -0800) | ||
| commit | 4462731e0597c31c68466601a5d74b2edb145d6d | |
| tree | f6b01ed81e7e992ef34b6205f1afc613b69aaddd | tree | snapshot |
| parent | 2454c962fbe82f23aac4a5d78a0c3b5ffaed83a0 | commit | diff |
combine-diff: do not punt on removed or added files.
When we remove a file, the parents' contents are all removed so
it is not that interesting to show all of them, but the fact it
was removed when all parents had it *is* unusual. When we add a
file, similarly the fact it was added when no parent wanted it
*is* unusual, and in addition the result matters, so show it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When we remove a file, the parents' contents are all removed so
it is not that interesting to show all of them, but the fact it
was removed when all parents had it *is* unusual. When we add a
file, similarly the fact it was added when no parent wanted it
*is* unusual, and in addition the result matters, so show it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| combine-diff.c | diff | blob | history |