| commit | eb3359663d62f35999330797455dbe738bd5ed99 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 3 Apr 2007 23:28:46 +0000 (3 16:28 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 4 Apr 2007 02:01:36 +0000 (3 19:01 -0700) | ||
| tree | ad96b70ce6f5834453867fa4dbd422cc767c09a8 | treesnapshot (tar.gz zip) |
| parent | 3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 | commitdiff |
rerere should not repeat the earlier hunks in later ones
When a file has more then one conflicting hunks, it repeated the
contents of previous hunks in output for later ones.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When a file has more then one conflicting hunks, it repeated the
contents of previous hunks in output for later ones.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| builtin-rerere.c | diffblobblamehistory | |
| t/t4200-rerere.sh | diffblobblamehistory |