Mercurial > hg-allpaths

diff tests/groups-modern.t @ 58:35d3c8ef6fe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed test failing on 4.0
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 13 Nov 2016 12:41:11 +0100
parents 14a3ffbba22b
children 5a517f942da0
line wrap: on
line diff
--- a/tests/groups-modern.t	Sun Nov 13 12:32:39 2016 +0100
+++ b/tests/groups-modern.t	Sun Nov 13 12:41:11 2016 +0100
@@ -253,7 +253,7 @@
   pushing to */rep1 (glob)
   searching for changes
   abort: push creates new remote head *! (glob)
-  (merge or see "hg help push" for details about pushing new heads)
+  \((merge or see .hg help push. for details about pushing new heads|did you forget to merge.*)\) (re)
   [255]
 
   $ hg --cwd $BASE pullall