Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo.t @ 18631:e2dc5397bc82
tests: update test output (will be folded into parent)
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Sat, 09 Feb 2013 15:22:04 -0800 |
parents | 0b6e6eacc939 |
children | 0ade08dcb3c3 |
line wrap: on
line diff
--- 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