# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1485959224 -3600
# Node ID 8e276bf812b1522824af543a45cc28f8450ecd1e
# Parent  e35667b01e1e30bbe5e1319fca3fef3e5a5f13fd# Parent  5526e97928d76a67843ab6eaea4db32298be9baa
merge with 5.6.0

No extra changes needed from the 'mercurial-4.' branch.

diff -r e35667b01e1e -r 8e276bf812b1 tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-evolve.t	Wed Feb 01 15:27:04 2017 +0100
@@ -1139,7 +1139,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
   $ hg fold
   hg: unknown command 'fold'
@@ -1165,7 +1165,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
 Enabling commands selectively, only fold enabled, next is still unknown
   $ cat >> $HGRCPATH <<EOF
@@ -1201,7 +1201,7 @@
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use "hg help" for the full list of commands or "hg -v" for details)
   [255]
 
 Restore all of the evolution features
diff -r e35667b01e1e -r 8e276bf812b1 tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-exchange-A3.t	Wed Feb 01 15:27:04 2017 +0100
@@ -168,7 +168,7 @@
   pushing to pushdest
   searching for changes
   abort: push creates new remote head e5ea8f9c7314!
-  (merge or see 'hg help push' for details about pushing new heads)
+  (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ cd ..
 
diff -r e35667b01e1e -r 8e276bf812b1 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-prev-next.t	Wed Feb 01 15:27:04 2017 +0100
@@ -221,7 +221,7 @@
   $ hg amend --edit &
   $ sleep 1
   $ hg prev
-  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
+  waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
   got lock after [4-6] seconds (re)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [0] one
@@ -230,7 +230,7 @@
   $ hg amend --edit &
   $ sleep 1
   $ hg next --evolve
-  waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
+  waiting for lock on working directory of $TESTTMP/repo held by '*' (glob)
   1 new unstable changesets
   got lock after [4-6] seconds (re)
   move:[2] two
diff -r e35667b01e1e -r 8e276bf812b1 tests/test-sharing.t
--- a/tests/test-sharing.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-sharing.t	Wed Feb 01 15:27:04 2017 +0100
@@ -342,7 +342,7 @@
   searching for changes
   remote has heads on branch 'default' that are not known locally: 540ba8f317e6
   abort: push creates new remote head cbdfbd5a5db2 with bookmark 'bug15'!
-  (pull and merge or see 'hg help push' for details about pushing new heads)
+  (pull and merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg pull ../public
   pulling from ../public
diff -r e35667b01e1e -r 8e276bf812b1 tests/test-simple4server.t
--- a/tests/test-simple4server.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-simple4server.t	Wed Feb 01 15:27:04 2017 +0100
@@ -8,7 +8,7 @@
   > [phases]
   > publish = False
   > [experimental]
-  > bundle2-exp=False # < Mercurial-4.0
+  > bundle2-exp=False
   > [devel]
   > legacy.exchange=bundle1
   > [extensions]
diff -r e35667b01e1e -r 8e276bf812b1 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Wed Feb 01 15:15:34 2017 +0100
+++ b/tests/test-stabilize-result.t	Wed Feb 01 15:27:04 2017 +0100
@@ -98,7 +98,7 @@
   +newer a
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"
-  abort: unresolved merge conflicts (see 'hg help resolve')
+  abort: unresolved merge conflicts (see "hg help resolve")
   [255]
   $ hg resolve -m a
   (no more unresolved files)