diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-03 16:28:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-03 19:01:36 -0700 |
| commit | eb3359663d62f35999330797455dbe738bd5ed99 (patch) | |
| tree | ad96b70ce6f5834453867fa4dbd422cc767c09a8 /commit.c | |
| parent | git-upload-pack: make sure we close unused pipe ends (diff) | |
| download | git-eb3359663d62f35999330797455dbe738bd5ed99.tar.gz git-eb3359663d62f35999330797455dbe738bd5ed99.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions