| commit | dce61e728b89611109e76cbc9fa897fe49d7869d | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 29 Jul 2008 23:17:01 +0000 (30 01:17 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jul 2008 06:21:36 +0000 (29 23:21 -0700) | ||
| tree | 56aef9a5e3c6e0ccf525361d02fcd39de5decfdf | treesnapshot (tar.gz zip) |
| parent | 1b1d78fe77d676bb79a9272ff6f3517697811990 | commitdiff |
Add a second testcase for handling invalid strategies in git-merge
This one tests '-s index' which is interesting because git-merge-index
is an existing git command but it is not a valid strategy.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This one tests '-s index' which is interesting because git-merge-index
is an existing git command but it is not a valid strategy.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7600-merge.sh | diffblobblamehistory |