Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-histedit-non-commute-abort.t
branchstable
changeset 48796 c00d3ce4e94b
parent 48591 f1162b125991 
--- a/tests/test-histedit-non-commute-abort.t	Fri Feb 18 12:55:39 2022 +0100
+++ b/tests/test-histedit-non-commute-abort.t	Fri Feb 18 14:27:43 2022 +0100
@@ -77,8 +77,8 @@
 insert unsupported advisory merge record
   $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
   $ hg debugmergestate
-  local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
-  other (histedit): e860deea161a2f77de56603b340ebbb4536308ae
+  local (already edited): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
+  other (current change): e860deea161a2f77de56603b340ebbb4536308ae
   file: e (state "u")
     local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")
     ancestor path: e (node 0000000000000000000000000000000000000000)
mercurial