changeset 33146 | 40ee74bfa111 |
parent 32854 | 29558247b00e |
child 33577 | 34a8ef358c93 |
--- a/tests/test-dirstate-race.t Wed Jun 28 17:41:25 2017 +0200 +++ b/tests/test-dirstate-race.t Thu Jun 29 15:21:52 2017 -0700 @@ -220,11 +220,13 @@ > test.args=$TESTTMP/mergetool-race.sh \$output > EOF +BROKEN: the "M b" line should not be there $ hg rebase -s . -d 3 --tool test rebasing 4:b08445fd6b2a "c4" (tip) merging a custom merge tool M a + M b ? a.orig custom merge tool end saved backup bundle to $TESTTMP/repo/.hg/strip-backup/* (glob)