--- a/tests/test-merge-subrepos.t Sat Jul 06 19:55:29 2019 -0400
+++ b/tests/test-merge-subrepos.t Thu Jun 20 11:40:47 2019 -0700
@@ -112,8 +112,8 @@
> d
> EOF
file 'b' was deleted in local [working copy] but was modified in other [destination].
- What do you want to do?
- use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
+ You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ What do you want to do? d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
XXX: There's a difference between wdir() and '.', so there should be a status.