diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-22 19:05:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-23 11:33:40 -0700 |
| commit | 4d175ef71d60086b898e4d871e699794d6a93dbf (patch) | |
| tree | 2a4191544775ca471f72b98261bcf94c90a0cf59 /t/t0002-gitfile.sh | |
| parent | 2d71bde2d1a8f4e1c06cb8049a794ba4ba35d37d (diff) | |
| download | git-4d175ef71d60086b898e4d871e699794d6a93dbf.tar.gz git-4d175ef71d60086b898e4d871e699794d6a93dbf.tar.xz | |
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>
Diffstat (limited to 't/t0002-gitfile.sh')
0 files changed, 0 insertions, 0 deletions