Mercurial > hg
diff tests/test-rename-merge1.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Fri, 30 Jul 2010 10:32:24 +0300 |
| parents | f2618cacb485 |
| children |
line wrap: on
line diff
--- a/tests/test-rename-merge1.out Sat Jul 10 21:23:00 2010 +0200 +++ b/tests/test-rename-merge1.out Fri Jul 30 10:32:24 2010 +0300 @@ -21,16 +21,16 @@ b2: remote created -> g preserving a for resolve of b removing a -update: a 1/3 files (33.33%) +updating: a 1/3 files (33.33%) picked tool 'internal:merge' for b (binary False symlink False) merging a and b to b my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c premerge successful -update: a2 2/3 files (66.67%) +updating: a2 2/3 files (66.67%) warning: detected divergent renames of a2 to: c2 b2 -update: b2 3/3 files (100.00%) +updating: b2 3/3 files (100.00%) getting b2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)