diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-03 23:28:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-04 02:01:36 (GMT) |
| commit | eb3359663d62f35999330797455dbe738bd5ed99 (patch) | |
| tree | ad96b70ce6f5834453867fa4dbd422cc767c09a8 /builtin-fmt-merge-msg.c | |
| parent | 3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 (diff) | |
| download | git-eb3359663d62f35999330797455dbe738bd5ed99.zip git-eb3359663d62f35999330797455dbe738bd5ed99.tar.gz git-eb3359663d62f35999330797455dbe738bd5ed99.tar.bz2 | |
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>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions