diff --git a/test/test_clone.py b/test/test_clone.py index 62e9c03..d5da7d9 100644 --- a/test/test_clone.py +++ b/test/test_clone.py @@ -100,7 +100,7 @@ def test_clone( run = runner(command=yadm_cmd('diff'), cwd=paths.work) assert run.success assert run.err == '' - assert '\n+conflict' in run.out, 'conflicts not stashed' + assert '\n+conflict' in run.out, 'conflict overwritten' # another force-related assertion if old_repo: