diff -r ca1ad8ef38be -r 21b33f0460e0 tests/test-merge-tools.t --- a/tests/test-merge-tools.t Thu Apr 23 21:23:13 2015 +0200 +++ b/tests/test-merge-tools.t Fri Apr 24 23:52:41 2015 +0900 @@ -608,7 +608,16 @@ true.executable=cat # hg update -C 1 $ hg update -q 0 + $ f -s f + f: size=17 + $ touch -t 200001010000 f + $ hg status f $ hg revert -q -r 1 . + $ f -s f + f: size=17 + $ touch -t 200001010000 f + $ hg status f + M f $ hg update -r 2 merging f revision 1 @@ -634,7 +643,16 @@ true.executable=cat # hg update -C 1 $ hg update -q 0 + $ f -s f + f: size=17 + $ touch -t 200001010000 f + $ hg status f $ hg revert -q -r 1 . + $ f -s f + f: size=17 + $ touch -t 200001010000 f + $ hg status f + M f $ hg update -r 2 --tool false merging f merging f failed!