Merge branch 'ar/t4150-am-scissors-test-fix'

Test fix. * ar/t4150-am-scissors-test-fix: t4150: fix broken test for am --scissors

Junio C Hamano committed Aug 17, 2018 at 13:09 UTC 2c8c407d0a3237a15b4c64249fca50cde4f16115

No changes.