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@xxxxxxxxxxxxxx>
---
Normally, the list of conflicted files come directly after
the headline like this
Conflicts:
folder/file
...
Without this patch it would looks like this:
Conflicts:
folder/file
...
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index a37846a..f6e44b8 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)) {
--
1.7.10.170.gac579
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html