From 31071d9ac9bd712b58d14d6170c297538393038e Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Wed, 3 Feb 2021 23:21:17 -0600 Subject: [PATCH] Clarify error message Conflicts are not stashed anymore --- test/test_clone.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: