commit | eb3359663d62f35999330797455dbe738bd5ed99 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <junkio@cox.net> | Tue Apr 03 16:28:46 2007 -0700 |
committer | Junio C Hamano <junkio@cox.net> | Tue Apr 03 19:01:36 2007 -0700 |
tree | ad96b70ce6f5834453867fa4dbd422cc767c09a8 | |
parent | 3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 [diff] |
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>