Clarify error message

Conflicts are not stashed anymore
This commit is contained in:
Tim Byrne 2021-02-03 23:21:17 -06:00
parent e6cfd39bbc
commit 31071d9ac9
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
1 changed files with 1 additions and 1 deletions

View File

@ -100,7 +100,7 @@ def test_clone(
run = runner(command=yadm_cmd('diff'),
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: