Test

2017-11-21 19:58:52 -05:00 · 2017-11-21 19:58:52 -05:00 · e71aba1143
parent eb500e0f17
commit e71aba1143
1 changed files with 1 additions and 0 deletions
--- a/check_update.py
+++ b/check_update.py
@ -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')