Merge branch 'ar/t4150-am-scissors-test-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
commit2c8c407d0a3237a15b4c64249fca50cde4f16115
tree3b6863d0296fabbdf2ff4288b22689efc779466e
parentc757aa2d12ceeb5a86c2da8ad1e9e752625af739
parentb7446fcfdf4e275ebe6cece33edd19760bb2cb0b
Merge branch 'ar/t4150-am-scissors-test-fix'

Test fix.

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