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-merge-prompt.t
changeset 15521 117f9190c1ba
parent 12365 22f3353bcc36
child 18543 c8ba98bf0e71 
--- a/tests/test-merge-prompt.t	Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-merge-prompt.t	Wed Nov 16 03:45:14 2011 +0100
@@ -77,7 +77,7 @@
 
   $ status
   --- status ---
-  file2: No such file or directory
+  file2: * (glob)
   C file1
   --- file1 ---
   1
@@ -133,7 +133,7 @@
 
   $ status
   --- status ---
-  file2: No such file or directory
+  file2: * (glob)
   C file1
   --- file1 ---
   1
mercurial