diff options
Diffstat (limited to 't/t6402-merge-rename.sh')
| -rwxr-xr-x | t/t6402-merge-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh index 3a32b1a..772238e 100755 --- a/t/t6402-merge-rename.sh +++ b/t/t6402-merge-rename.sh @@ -210,7 +210,7 @@ test_expect_success 'updated working tree file should prevent the merge' ' echo >>M one line addition && cat M >M.saved && git update-index M && - test_expect_code 128 git pull --no-rebase . yellow && + test_expect_code 2 git pull --no-rebase . yellow && test_cmp M M.saved && rm -f M.saved ' |