diff -r a7f8939641aa -r 978b907d9b36 tests/test-subrepo-missing.t --- a/tests/test-subrepo-missing.t Fri Aug 12 06:01:42 2016 -0700 +++ b/tests/test-subrepo-missing.t Fri Aug 12 05:56:40 2016 -0700 @@ -62,7 +62,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm .hgsubstate $ hg up 0 - remote [destination] changed .hgsubstate which local [working copy] deleted + other [destination] changed .hgsubstate which local [working copy] deleted use (c)hanged version or leave (d)eleted? c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st