Mercurial > public > mercurial-scm > hg

diff tests/test-copy-move-merge.out @ 10431:ba5e508b5e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: make calls to ui.progress()
author Augie Fackler <durin42@gmail.com>
date Sun, 07 Feb 2010 17:44:30 -0600
parents af5f099d932b
children f2618cacb485
line wrap: on
line diff
--- a/tests/test-copy-move-merge.out	Sun Feb 07 12:00:40 2010 -0600
+++ b/tests/test-copy-move-merge.out	Sun Feb 07 17:44:30 2010 -0600
@@ -15,10 +15,12 @@
 preserving a for resolve of b
 preserving a for resolve of c
 removing a
+update: a 1/2 files (50.00%)
 picked tool 'internal:merge' for b (binary False symlink False)
 merging a and b to b
 my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
  premerge successful
+update: a 2/2 files (100.00%)
 picked tool 'internal:merge' for c (binary False symlink False)
 merging a and c to c
 my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052