git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbca583)
Add new test to ensure git-merge handles pull.twohead and pull.octopus
authorMiklos Vajna <redacted>
Sun, 29 Jun 2008 14:51:38 +0000 (16:51 +0200)
committerJunio C Hamano <redacted>
Tue, 1 Jul 2008 05:45:50 +0000 (22:45 -0700)
commitb2eabcc2539c021ea6cb2d1d2d28c8213986a186
tree718983f98ee906816d19c0b5021d77bee92459a8tree | snapshot
parentfbca58373291afa07c5b30ab562d36ce0f6174e0commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t7601-merge-pull-config.sh [new file with mode: 0755] blob
git clone https://git.99rst.org/PROJECT