Add a second testcase for handling invalid strategies in git-merge
authorMiklos Vajna <vmiklos@frugalware.org>
Tue, 29 Jul 2008 23:17:01 +0000 (01:17 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2008 06:21:36 +0000 (23:21 -0700)
commitdce61e7...8b89611109e76cbc9fa897fe49d7869d
tree56aef9a...e3c6e0ccf525361d02fcd39de5decfdfcopy hash to clipboard (tree)
parent1b1d78f...77d676bb79a9272ff6f3517697811990copy hash to clipboard (diff)
t/t7600-merge.sh