commit 2a902e0a073647334076360bad571477aea1f1cf
author Anthony Sottile <asottile@umich.edu> Wed Jul 12 18:35:24 2017 -0700
committer Anthony Sottile <asottile@umich.edu> Wed Jul 12 18:58:30 2017 -0700
tree 402514f94a08a6f03d6d9954fabb7a82f1e55c5e
parent 286962eeb7af67f321b94a22e8edbd3004b1810e

Use asottile/add-trailing-comma

tests/check_merge_conflict_test.py

diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index 5a2e82a..a999aca 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py
@@ -45,7 +45,7 @@
             'child\n'
             '=======\n'
             'parent\n'
-            '>>>>>>>'
+            '>>>>>>>',
         ) or f1.startswith(
             '<<<<<<< HEAD\n'
             'child\n'
@@ -53,7 +53,7 @@
             '||||||| merged common ancestors\n'
             '=======\n'
             'parent\n'
-            '>>>>>>>'
+            '>>>>>>>',
         ) or f1.startswith(
             # .gitconfig with [pull] rebase = preserve causes a rebase which
             # flips parent / child
@@ -61,7 +61,7 @@
             'parent\n'
             '=======\n'
             'child\n'
-            '>>>>>>>'
+            '>>>>>>>',
         )
         assert os.path.exists(os.path.join('.git', 'MERGE_MSG'))
         yield