diff -r 975d959295ef -r a3fd84f4fb38 tests/test-sparse-merges.t --- a/tests/test-sparse-merges.t Sat Aug 25 21:17:34 2018 +0300 +++ b/tests/test-sparse-merges.t Sun Aug 26 19:14:26 2018 +0300 @@ -113,7 +113,7 @@ $ hg merge temporarily included 1 file(s) in the sparse checkout for merging - file 'd' was deleted in local [working copy] but was modified in other [merge rev]. + file 'd' was deleted in other [merge rev] but was modified in local [working copy]. What do you want to do? use (c)hanged version, (d)elete, or leave (u)nresolved? u 0 files updated, 0 files merged, 0 files removed, 1 files unresolved