Mercurial > hg
diff tests/test-up-local-change.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 | 6f1894d6a6b0 |
children |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Sat Jul 10 21:23:00 2010 +0200 +++ b/tests/test-up-local-change.out Fri Jul 30 10:32:24 2010 +0300 @@ -24,11 +24,11 @@ a: versions differ -> m b: remote created -> g preserving a for resolve of a -update: a 1/2 files (50.00%) +updating: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b -update: b 2/2 files (100.00%) +updating: b 2/2 files (100.00%) getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 @@ -43,9 +43,9 @@ a: versions differ -> m b: other deleted -> r preserving a for resolve of a -update: b 1/2 files (50.00%) +updating: b 1/2 files (50.00%) removing b -update: a 2/2 files (100.00%) +updating: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 @@ -71,11 +71,11 @@ a: versions differ -> m b: remote created -> g preserving a for resolve of a -update: a 1/2 files (50.00%) +updating: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b -update: b 2/2 files (100.00%) +updating: b 2/2 files (100.00%) getting b 1 files updated, 1 files merged, 0 files removed, 0 files unresolved changeset: 1:802f095af299 @@ -128,11 +128,11 @@ b: versions differ -> m preserving a for resolve of a preserving b for resolve of b -update: a 1/2 files (50.00%) +updating: a 1/2 files (50.00%) picked tool 'true' for a (binary False symlink False) merging a my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b -update: b 2/2 files (100.00%) +updating: b 2/2 files (100.00%) picked tool 'true' for b (binary False symlink False) merging b my b@802f095af299+ other b@030602aee63d ancestor b@000000000000