commit da8ab1ffe86488e8953ec265dffd221e4b65629d
author Anthony Sottile <asottile@umich.edu> Mon Mar 26 08:33:11 2018 -0700
committer Anthony Sottile <asottile@umich.edu> Mon Mar 26 08:33:11 2018 -0700
tree 52c0774521aec6cc4cd24c0987e4a07d5a60effb
parent 16ff195820d4b946b0cb5e1cf4290b2a6d5b9f19

pull with --no-rebase

tests/check_merge_conflict_test.py

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 @@
     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(