Mercurial > hg

diff tests/test-graft.t @ 45916:fa87536d3d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents 527ce85c2e60
children 69429972ff1f
line wrap: on
line diff
--- a/tests/test-graft.t	Mon Nov 23 16:20:02 2020 -0800
+++ b/tests/test-graft.t	Mon Nov 23 16:48:13 2020 -0800
@@ -324,7 +324,7 @@
   $ hg graft -c
   grafting 4:9c233e8e184d "4"
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 Fix up: