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-issue1802.t
changeset 44162 baf3fe2977cc
parent 42167 91a0bc50b288 
--- a/tests/test-issue1802.t	Fri Jan 24 07:00:45 2020 -0800
+++ b/tests/test-issue1802.t	Wed Jan 22 15:20:12 2020 -0800
@@ -52,8 +52,6 @@
 Simulate a Windows merge:
 
   $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
-    unmatched files in local:
-     b
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
mercurial