Mercurial > hg

diff tests/test-merge7.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 a3d73b3e1f8a
children db426935fa94
line wrap: on
line diff
--- a/tests/test-merge7.out	Sun Feb 07 12:00:40 2010 -0600
+++ b/tests/test-merge7.out	Sun Feb 07 17:44:30 2010 -0600
@@ -25,6 +25,7 @@
  ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
  test.txt: versions differ -> m
 preserving test.txt for resolve of test.txt
+update: test.txt 1/1 files (100.00%)
 picked tool 'internal:merge' for test.txt (binary False symlink False)
 merging test.txt
 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9