changeset 32698 | 1b5c61d38a52 |
parent 30229 | 69ffbbe73dd0 |
child 34661 | eb586ed5d8ce |
--- a/tests/test-up-local-change.t Fri May 19 20:29:11 2017 -0700 +++ b/tests/test-up-local-change.t Tue Jun 06 22:17:39 2017 +0530 @@ -172,6 +172,7 @@ $ hg --debug up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "1e71731e6fbb: 2" 1 other heads for branch "default" test conflicting untracked files