test-stabilize-conflict.t: yes is not a standard shell utility
And for some reason the test fails on OSX.
--- a/tests/test-stabilize-conflict.t Wed Oct 10 14:58:21 2012 +0200
+++ b/tests/test-stabilize-conflict.t Sat Oct 13 16:31:52 2012 +0200
@@ -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