Add new test to ensure git-merge handles pull.twohead and pull.octopus
authorMiklos Vajna <vmiklos@frugalware.org>
Sun, 29 Jun 2008 14:51:38 +0000 (16:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 05:45:50 +0000 (22:45 -0700)
commitb2eabcc...539c021ea6cb2d1d2d28c8213986a186
tree718983f...8ee906816d19c0b5021d77bee92459a8copy hash to clipboard (tree)
parentfbca583...3291afa07c5b30ab562d36ce0f6174e0copy hash to clipboard (diff)
t/t7601-merge-pull-config.sh [new file with mode: 0755]