Mercurial > hg
diff tests/test-rename-merge1.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-rename-merge1.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-rename-merge1.out Sun Feb 07 17:44:30 2010 -0600 @@ -21,13 +21,16 @@ b2: remote created -> g preserving a for resolve of b removing a +update: a 1/3 files (33.33%) picked tool 'internal:merge' for b (binary False symlink False) merging a and b to b my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c premerge successful +update: a2 2/3 files (66.67%) warning: detected divergent renames of a2 to: c2 b2 +update: b2 3/3 files (100.00%) getting b2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)