Commits

Bryan O'Sullivan  committed fb14a5d Merge

Merge with stable

  • Participants
  • Parent commits d8ad046, ce2c709

Comments (0)

Files changed (2)

File tests/test-mq-qrefresh.t

   $ echo 'orphan' > orphanchild
   $ hg add orphanchild
   $ hg qrefresh nonexistentfilename # clear patch
-  nonexistentfilename: No such file or directory
+  nonexistentfilename: * (glob)
   $ hg qrefresh --short 1/base
   $ hg qrefresh --short 2/base
 

File tests/test-subrepo.t

   issue3276_ok
   $ rm repo/s/b
   $ hg -R repo revert --all
-  reverting repo/.hgsubstate
+  reverting repo/.hgsubstate (glob)
   reverting subrepo s
   $ hg -R repo update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved