# HG changeset patch # User Pierre-Yves David # Date 1416236688 -3600 # Node ID a1f5a948420dd6f152822705caa47251d1f7d185 # Parent 30b47885426085084d703af27b1726e25bf715ac test: ensure we echo prompt Tool running using the shipped 'run-tests.py' instead of the mercurial one would get different result otherwise. diff -r 30b478854260 -r a1f5a948420d tests/test-stabilize-conflict.t --- 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]