mirror of
https://github.com/morpheus65535/bazarr
synced 2024-12-25 01:02:19 +00:00
Test
This commit is contained in:
parent
eb500e0f17
commit
e71aba1143
1 changed files with 1 additions and 0 deletions
|
@ -42,6 +42,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
|
|||
tree,
|
||||
[repo.head.target, remote_id])
|
||||
repo.state_cleanup()
|
||||
result = 'Conflict detected when trying to update.'
|
||||
else:
|
||||
raise AssertionError('Unknown merge analysis result')
|
||||
|
||||
|
|
Loading…
Reference in a new issue