From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2018 20:09:59 +0000 (-0700)
Subject: Merge branch 'ar/t4150-am-scissors-test-fix'
X-Git-Tag: v2.19.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c8c407d0a3237a15b4c64249fca50cde4f16115;p=thirdparty%2Fgit.git

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

Test fix.

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

2c8c407d0a3237a15b4c64249fca50cde4f16115