Mercurial > hg
diff tests/test-merge-commit.out @ 10431:ba5e508b5e92
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-merge-commit.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-merge-commit.out Sun Feb 07 17:44:30 2010 -0600 @@ -28,6 +28,7 @@ ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 bar: versions differ -> m preserving bar for resolve of bar +update: bar 1/1 files (100.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging bar my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 @@ -78,6 +79,7 @@ ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 bar: versions differ -> m preserving bar for resolve of bar +update: bar 1/1 files (100.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging bar my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510