From e71aba11431f2297751396362b259e697f3e282e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Tue, 21 Nov 2017 19:58:52 -0500
Subject: [PATCH] Test

---
 check_update.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/check_update.py b/check_update.py
index 1360fe4d3..441a1e7cb 100644
--- 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')