changeset 42110 | 3a7efcbdf288 |
parent 39489 | f1186c292d03 |
child 44091 | 3df0bd706c40 |
--- a/tests/test-issue1175.t Fri Apr 12 12:20:38 2019 -0400 +++ b/tests/test-issue1175.t Fri Apr 12 09:41:08 2019 -0700 @@ -14,8 +14,8 @@ $ hg mv a a2 $ hg up note: possible conflict - a was renamed multiple times to: + a1 a2 - a1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg ci -m2