diff options
Diffstat (limited to 'tests/git_test.py')
| -rw-r--r-- | tests/git_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/git_test.py b/tests/git_test.py index b9f524a..93f5a1c 100644 --- a/tests/git_test.py +++ b/tests/git_test.py @@ -104,7 +104,7 @@ def test_is_in_merge_conflict_submodule(in_conflicting_submodule): def test_cherry_pick_conflict(in_merge_conflict): cmd_output('git', 'merge', '--abort') foo_ref = cmd_output('git', 'rev-parse', 'foo')[1].strip() - cmd_output('git', 'cherry-pick', foo_ref, retcode=None) + cmd_output('git', 'cherry-pick', foo_ref, check=False) assert git.is_in_merge_conflict() is False |