From da8ab1ffe86488e8953ec265dffd221e4b65629d Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 26 Mar 2018 08:33:11 -0700 Subject: [PATCH] pull with --no-rebase --- tests/check_merge_conflict_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py index 8a848ba..2460277 100644 --- a/tests/check_merge_conflict_test.py +++ b/tests/check_merge_conflict_test.py @@ -37,7 +37,7 @@ def f1_is_a_conflict_file(tmpdir): with repo2.as_cwd(): repo2_f1.write('child\n') cmd_output('git', 'commit', '--no-gpg-sign', '-am', 'clone commit2') - cmd_output('git', 'pull', retcode=None) + cmd_output('git', 'pull', '--no-rebase', retcode=None) # We should end up in a merge conflict! f1 = repo2_f1.read() assert f1.startswith(