changeset 18631 | e2dc5397bc82 |
parent 18612 | 0b6e6eacc939 |
child 18720 | 0ade08dcb3c3 |
--- a/tests/test-subrepo.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-subrepo.t Sat Feb 09 15:22:04 2013 -0800 @@ -214,8 +214,8 @@ branchmerge: False, force: False, partial: False ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a t: remote is newer -> g + getting t updating: t 1/1 files (100.00%) - getting t 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg debugsub