summaryrefslogtreecommitdiff
path: root/t/t1013/objects/1e
diff options
context:
space:
mode:
authorLibravatar Ralf Thielow <ralf.thielow@googlemail.com>2012-04-18 23:07:25 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-19 13:48:01 -0700
commit51120683ec8664c8b34b8541a0518a4902ee9d94 (patch)
tree26d189459f58253970c7be743e81328109c96dee /t/t1013/objects/1e
parentMerge branch 'maint-1.7.9' into maint (diff)
downloadtgif-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 't/t1013/objects/1e')
0 files changed, 0 insertions, 0 deletions