git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1b1d78f)
Add a second testcase for handling invalid strategies in git-merge
authorMiklos Vajna <redacted>
Tue, 29 Jul 2008 23:17:01 +0000 (01:17 +0200)
committerJunio C Hamano <redacted>
Wed, 30 Jul 2008 06:21:36 +0000 (23:21 -0700)
commitdce61e728b89611109e76cbc9fa897fe49d7869d
tree56aef9a5e3c6e0ccf525361d02fcd39de5decfdftree | snapshot
parent1b1d78fe77d676bb79a9272ff6f3517697811990commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7600-merge.sh diff | blob | history
git clone https://git.99rst.org/PROJECT