Mercurial > hg
diff tests/test-double-merge.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 | d8143769e1d4 |
children | f2618cacb485 |
line wrap: on
line diff
--- a/tests/test-double-merge.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-double-merge.out Sun Feb 07 17:44:30 2010 -0600 @@ -17,10 +17,12 @@ foo: remote copied to bar -> m preserving foo for resolve of bar preserving foo for resolve of foo +update: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da premerge successful +update: foo 2/2 files (100.00%) picked tool 'internal:merge' for foo (binary False symlink False) merging foo my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da