Mercurial > hg > evolve
changeset 580:4676650f4f9d stable
test-stabilize-conflict.t: yes is not a standard shell utility
And for some reason the test fails on OSX.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 13 Oct 2012 16:31:52 +0200 |
parents | 2cd2ee20d9fa |
children | b66b05065dd0 |
files | tests/test-stabilize-conflict.t |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t +++ b/tests/test-stabilize-conflict.t @@ -201,7 +201,9 @@ $ hg amend 1 new unstable changesets $ sed -i'' 's/interactive=.*/interactive=true/' $HGRCPATH - $ yes n 2> ../shutup | HGMERGE=touch hg evolve + $ HGMERGE=touch hg evolve <<EOF + > n + > EOF move:[8] babar count up to fifteen atop:[10] babar count up to ten merging babar