Andrew's git / gitweb.git / diff
?
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)
Test fix.

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

1  2 
t/t4150-am.sh patch | diff1 | diff2 | blob | history
diff --cc t/t4150-am.sh
Simple merge