index 08c9f7989a578d57a3c0f868786fa6b4cc2bf777..2cf42c73f14ef5069d096fb29e67dac571227cfe 100755 (executable)
! grep 1 file
'
+test_expect_success 'pull with -X' '
+ git reset --hard master && git pull -s recursive -Xours . side &&
+ git reset --hard master && git pull -s recursive -X ours . side &&
+ git reset --hard master && git pull -s recursive -Xtheirs . side &&
+ git reset --hard master && git pull -s recursive -X theirs . side &&
+ git reset --hard master && test_must_fail git pull -s recursive -X bork . side
+'
+
test_done