Mercurial > public > mercurial-scm > hg

diff tests/test-merge-remove.t @ 46418:dc00324e80f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: use StateError more in merge module Differential Revision: https://phab.mercurial-scm.org/D9912
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 29 Jan 2021 15:56:08 -0800
parents 4764e8436b2a
children 87b3010c08e0
line wrap: on
line diff
--- a/tests/test-merge-remove.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-merge-remove.t	Fri Jan 29 15:56:08 2021 -0800
@@ -95,7 +95,7 @@
   $ hg merge
   bar: untracked file differs
   abort: untracked files in working directory differ from files in requested revision
-  [255]
+  [20]
   $ cat bar
   memories of buried pirate treasure