diff options
| author | Ralf Thielow <ralf.thielow@googlemail.com> | 2012-04-18 23:07:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-19 13:48:01 -0700 |
| commit | 51120683ec8664c8b34b8541a0518a4902ee9d94 (patch) | |
| tree | 26d189459f58253970c7be743e81328109c96dee | |
| parent | fdec2eb8ebbf995a77e2ab9971565c792b52944a (diff) | |
| download | git-51120683ec8664c8b34b8541a0518a4902ee9d94.tar.gz git-51120683ec8664c8b34b8541a0518a4902ee9d94.tar.xz | |
sequencer: remove additional blank line
Remove an additional blank line between the
headline and the list of conflicted files after
doing a recursive merge.
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index a37846a59..f6e44b8be 100644 --- a/sequencer.c +++ b/sequencer.c @@ -234,7 +234,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, if (!clean) { int i; - strbuf_addstr(msgbuf, "\nConflicts:\n\n"); + strbuf_addstr(msgbuf, "\nConflicts:\n"); for (i = 0; i < active_nr;) { struct cache_entry *ce = active_cache[i++]; if (ce_stage(ce)) { |