diff -r ac49ecb2a897 -r 72072cfc7e91 tests/test-merge5.t --- a/tests/test-merge5.t Wed Feb 03 04:37:04 2016 +0000 +++ b/tests/test-merge5.t Tue Feb 02 14:49:02 2016 +0000 @@ -24,6 +24,7 @@ $ hg revert b $ hg update -c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + 1 other heads for branch "default" $ mv a c Should abort: