diff tests/test-strip.t @ 44345:14d0e89520a2

graphlog: use '%' for other context in merge conflict This lets the user more easily find the commit that is involved in the conflict, such as the source of `hg update -m` or the commit being grafted by `hg graft`. Differential Revision: https://phab.mercurial-scm.org/D8043
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jan 2020 21:49:50 -0800
parents ab632e27f296
children 27822b8436bf
line wrap: on
line diff
--- a/tests/test-strip.t	Wed Jan 29 14:42:54 2020 -0800
+++ b/tests/test-strip.t	Tue Jan 28 21:49:50 2020 -0800
@@ -598,7 +598,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     b
   |
-  o  changeset:   0:9ab35a2d17cb
+  %  changeset:   0:9ab35a2d17cb
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a