aboutsummaryrefslogtreecommitdiff
path: root/quote.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-03 16:28:46 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-03 19:01:36 -0700
commiteb3359663d62f35999330797455dbe738bd5ed99 (patch)
treead96b70ce6f5834453867fa4dbd422cc767c09a8 /quote.h
parent3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 (diff)
downloadgit-eb3359663d62f35999330797455dbe738bd5ed99.tar.gz
git-eb3359663d62f35999330797455dbe738bd5ed99.tar.xz
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 'quote.h')
0 files changed, 0 insertions, 0 deletions