changeset 10431 | ba5e508b5e92 |
parent 8753 | af5f099d932b |
child 11716 | db426935fa94 |
--- a/tests/test-issue522.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-issue522.out Sun Feb 07 17:44:30 2010 -0600 @@ -8,6 +8,7 @@ overwrite None partial False ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee foo: remote is newer -> g +update: foo 1/1 files (100.00%) getting foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)