Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1167:a1f5a948420d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: ensure we echo prompt Tool running using the shipped 'run-tests.py' instead of the mercurial one would get different result otherwise.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 17 Nov 2014 16:04:48 +0100
parents a44a26f8cc48
children cc3e68120185
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Mon Oct 13 11:09:35 2014 +0200
+++ b/tests/test-stabilize-conflict.t	Mon Nov 17 16:04:48 2014 +0100
@@ -8,6 +8,7 @@
   > [ui]
   > interactive=false
   > merge=internal:merge
+  > promptecho = True
   > [defaults]
   > amend=-d "0 0"
   > [merge-tools]