зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
fdec2eb8eb
Коммит
51120683ec
|
@ -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)) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче