changeset 32854 | 29558247b00e |
parent 32835 | 1b25c648d5b7 |
child 33146 | 40ee74bfa111 |
--- a/tests/test-dirstate-race.t Sat May 06 16:24:21 2017 +0900 +++ b/tests/test-dirstate-race.t Wed Jun 14 23:56:58 2017 -0400 @@ -209,7 +209,7 @@ $ cat >> $TESTTMP/mergetool-race.sh << EOF > echo "custom merge tool" > printf "c2\nc3\nc4\n" > \$1 - > hg --cwd $TESTTMP/repo status + > hg --cwd "$TESTTMP/repo" status > echo "custom merge tool end" > EOF $ cat >> $HGRCPATH << EOF