| commit | 51120683ec8664c8b34b8541a0518a4902ee9d94 | |
| author | Ralf Thielow <ralf.thielow@googlemail.com> | |
| Wed, 18 Apr 2012 21:07:25 +0000 (18 23:07 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 19 Apr 2012 20:48:01 +0000 (19 13:48 -0700) | ||
| tree | 26d189459f58253970c7be743e81328109c96dee | treesnapshot (tar.gz zip) |
| parent | fdec2eb8ebbf995a77e2ab9971565c792b52944a | commitdiff |
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>
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>
| sequencer.c | diffblobblamehistory |