Mercurial > hg
diff tests/test-double-merge.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-double-merge.out Sat Jul 10 21:23:00 2010 +0200 +++ b/tests/test-double-merge.out Fri Jul 30 10:32:24 2010 +0300 @@ -17,12 +17,12 @@ foo: remote copied to bar -> m preserving foo for resolve of bar preserving foo for resolve of foo -update: foo 1/2 files (50.00%) +updating: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da premerge successful -update: foo 2/2 files (100.00%) +updating: foo 2/2 files (100.00%) picked tool 'internal:merge' for foo (binary False symlink False) merging foo my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da