psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Clarify error message

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/test_clone.py
View file

@ -100,7 +100,7 @@ def test_clone(
run = runner(command=yadm_cmd('diff'), cwd=paths.work) run = runner(command=yadm_cmd('diff'), cwd=paths.work)
assert run.success assert run.success
assert run.err == '' assert run.err == ''
assert '\n+conflict' in run.out, 'conflicts not stashed' assert '\n+conflict' in run.out, 'conflict overwritten'
# another force-related assertion # another force-related assertion
if old_repo: if old_repo: