changeset 25125 | bd625cd4e5e7 |
parent 22046 | 7a9cbb315d84 |
child 34661 | eb586ed5d8ce |
--- a/tests/test-issue1802.t Fri May 15 11:52:39 2015 +0800 +++ b/tests/test-issue1802.t Sat May 09 23:40:40 2015 -0700 @@ -58,7 +58,6 @@ branchmerge: True, force: False, partial: False ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 a: update permissions -> e - updating: a 1/1 files (100.00%) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)