Clarify error message

Conflicts are not stashed anymore
2021-02-03 23:21:17 -06:00 · 2021-02-03 23:21:17 -06:00 · 31071d9ac9
parent e6cfd39bbc
commit 31071d9ac9
1 changed files with 1 additions and 1 deletions
--- 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: