Right justify suggestion

Co-authored-by: Michael Haggerty <mhagger@alum.mit.edu>
mhagger · Jul 15, 2020 · 70df190 · 70df190
1 parent 4b6550d
commit 70df190
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gitimerge.py b/gitimerge.py
@@ -3719,8 +3719,8 @@ def cmd_diagram(parser, options):
     sys.stdout.write(
         '  * = merge done manually                                 o-0-1-2..-%(len1)d  %(tip1)s\n'
         '  . = merge done automatically                              1\n'
-        '  # = conflict that is currently blocking progress          ..\n'
-        '  @ = merge was blocked but has been resolved               %(len2)d\n'
+        '  # = conflict that is currently blocking progress         ..\n'
+        '  @ = merge was blocked but has been resolved           %(len2)4d\n'
         '  ? = no merge recorded                                    %(tip2)s\n'
         '' % {
             'tip1': merge_state.tip1,