tests: check git does not barf on merge.ff values for future versions of git
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 6 May 2011 21:59:47 +0000 (16:59 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 23:03:37 +0000 (16:03 -0700)
commit8c5cea0...95ee57c36fddfb9016810c230ce26557
tree8d5ff7b...4b5f95f926d93a61be18fc0e29b62008copy hash to clipboard (tree)
parentf23e8de...d544c8f81b40c98211f6cb028fa70cdccopy hash to clipboard (diff)
t/t7600-merge.sh