diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-29 14:51:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 05:45:50 (GMT) |
| commit | b2eabcc2539c021ea6cb2d1d2d28c8213986a186 (patch) | |
| tree | 718983f98ee906816d19c0b5021d77bee92459a8 /read-cache.c | |
| parent | fbca58373291afa07c5b30ab562d36ce0f6174e0 (diff) | |
| download | git-b2eabcc2539c021ea6cb2d1d2d28c8213986a186.zip git-b2eabcc2539c021ea6cb2d1d2d28c8213986a186.tar.gz git-b2eabcc2539c021ea6cb2d1d2d28c8213986a186.tar.bz2 | |
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>
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions