changeset 18631 | e2dc5397bc82 |
parent 18605 | bcf29565d89f |
child 22896 | 7e9cbb9c6053 |
--- a/tests/test-issue522.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-issue522.t Sat Feb 09 15:22:04 2013 -0800 @@ -32,8 +32,8 @@ branchmerge: True, force: False, partial: False ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee foo: remote is newer -> g + getting foo updating: 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)