changeset 25125 | bd625cd4e5e7 |
parent 22896 | 7e9cbb9c6053 |
child 26420 | 2fc86d92c4a9 |
--- a/tests/test-issue522.t Fri May 15 11:52:39 2015 +0800 +++ b/tests/test-issue522.t Sat May 09 23:40:40 2015 -0700 @@ -33,7 +33,6 @@ ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee foo: remote is newer -> g getting foo - updating: foo 1/1 files (100.00%) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)