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-mq-qfold.t
changeset 26780 bbf544b5f2e9
parent 26587 56b2bcea2529
child 26998 4414d500604f 
--- a/tests/test-mq-qfold.t	Wed Oct 14 02:06:54 2015 -0400
+++ b/tests/test-mq-qfold.t	Wed Oct 14 03:30:27 2015 -0400
@@ -59,7 +59,7 @@
 
   $ echo d >> a
   $ hg qfold p3
-  abort: local changes found, refresh first
+  abort: local changes found, qrefresh first
   [255]
 
   $ hg diff -c .
@@ -181,7 +181,7 @@
 
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3
-  refresh interrupted while patch was popped! (revert --all, qpush to recover)
+  qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
   abort: emulating unexpected abort
   [255]
   $ test -f .hg/last-message.txt
@@ -232,7 +232,7 @@
   transaction abort!
   rollback completed
   note: commit message saved in .hg/last-message.txt
-  refresh interrupted while patch was popped! (revert --all, qpush to recover)
+  qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
   abort: pretxncommit.unexpectedabort hook exited with status 1
   [255]
   $ cat .hg/last-message.txt
mercurial