diff tests/test-strip.t @ 44344:ab632e27f296

tests: add `hg log -G` output when there are merge conflicts

The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.

Differential Revision: https://phab.mercurial-scm.org/D8042

--- a/tests/test-strip.t	Wed Jan 29 11:30:35 2020 -0800
+++ b/tests/test-strip.t	Wed Jan 29 14:42:54 2020 -0800
@@ -591,6 +591,18 @@
   phases: 2 draft
   mq:     3 unapplied
 
+  $ hg log --graph
+  @  changeset:   1:76dcf9fab855
+  |  tag:         tip
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     b
+  |
+  o  changeset:   0:9ab35a2d17cb
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     a
+  
   $ echo c > b
   $ hg strip tip
   abort: uncommitted changes