Commits

Patrick Mézard  committed 4676650

test-stabilize-conflict.t: yes is not a standard shell utility

And for some reason the test fails on OSX.

  • Participants
  • Parent commits 2cd2ee2

Comments (0)

Files changed (1)

File tests/test-stabilize-conflict.t

   $ 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