Mercurial > hg
diff tests/test-graft.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 | bcf29565d89f |
children | 76b69cccb07a |
line wrap: on
line diff
--- a/tests/test-graft.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-graft.t Sat Feb 09 15:22:04 2013 -0800 @@ -150,8 +150,8 @@ branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 e: remote is newer -> g + getting e updating: e 1/1 files (100.00%) - getting e e grafting revision 4 searching for copies back to rev 1 @@ -161,8 +161,8 @@ d: remote is newer -> g e: versions differ -> m preserving e for resolve of e + getting d updating: d 1/2 files (50.00%) - getting d updating: e 2/2 files (100.00%) picked tool 'internal:merge' for e (binary False symlink False) merging e