t7601: extend the 'merge picks up the best result' test
authorMiklos Vajna <vmiklos@frugalware.org>
Tue, 22 Jul 2008 17:05:59 +0000 (19:05 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Jul 2008 18:33:40 +0000 (11:33 -0700)
commit4d175ef...1d60086b898e4d871e699794d6a93dbf
tree2a41915...4775ca471f72b98261bcf94c90a0cf59copy hash to clipboard (tree)
parent2d71bde...d1a8f4e1c06cb8049a794ba4ba35d37dcopy hash to clipboard (diff)
t/t7601-merge-pull-config.sh