| commit | b2eabcc2539c021ea6cb2d1d2d28c8213986a186 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Sun, 29 Jun 2008 14:51:38 +0000 (29 16:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 05:45:50 +0000 (30 22:45 -0700) | ||
| tree | 718983f98ee906816d19c0b5021d77bee92459a8 | treesnapshot (tar.gz zip) |
| parent | fbca58373291afa07c5b30ab562d36ce0f6174e0 | commitdiff |
Add new test to ensure git-merge handles pull.twohead and pull.octopus
Test if the given strategies are used and test the case when multiple
strategies are configured using a space separated list.
Also test if the best strategy is picked if none is specified. This is
done by adding a simple test case where recursive detects a rename, but
resolve does not, and verify that finally merge will pick up the
previous.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Test if the given strategies are used and test the case when multiple
strategies are configured using a space separated list.
Also test if the best strategy is picked if none is specified. This is
done by adding a simple test case where recursive detects a rename, but
resolve does not, and verify that finally merge will pick up the
previous.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7601-merge-pull-config.sh | [new file with mode: 0755] | blob |