| commit | 4d175ef71d60086b898e4d871e699794d6a93dbf | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 22 Jul 2008 17:05:59 +0000 (22 19:05 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Jul 2008 18:33:40 +0000 (23 11:33 -0700) | ||
| tree | 2a4191544775ca471f72b98261bcf94c90a0cf59 | treesnapshot (tar.gz zip) |
| parent | 2d71bde2d1a8f4e1c06cb8049a794ba4ba35d37d | commitdiff |
t7601: extend the 'merge picks up the best result' test
The test only checked if the best result picking code works if there are
multiple strategies set in the config. Add a similar one that tests if
the same true if the -s option of git merge was used multiple times.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The test only checked if the best result picking code works if there are
multiple strategies set in the config. Add a similar one that tests if
the same true if the -s option of git merge was used multiple times.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7601-merge-pull-config.sh | diffblobblamehistory |