diff options
author | 2012-04-18 23:07:25 +0200 | |
---|---|---|
committer | 2012-04-19 13:48:01 -0700 | |
commit | 51120683ec8664c8b34b8541a0518a4902ee9d94 (patch) | |
tree | 26d189459f58253970c7be743e81328109c96dee /Documentation/git-shell.txt | |
parent | Merge branch 'maint-1.7.9' into maint (diff) | |
download | tgif-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>
Diffstat (limited to 'Documentation/git-shell.txt')
0 files changed, 0 insertions, 0 deletions