Mercurial > hg
diff tests/test-merge-types.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 | db426935fa94 |
line wrap: on
line diff
--- a/tests/test-merge-types.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-merge-types.out Sun Feb 07 17:44:30 2010 -0600 @@ -8,6 +8,7 @@ conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e +update: a 1/1 files (100.00%) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % symlink is local parent, executable is other @@ -20,6 +21,7 @@ conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g +update: a 1/1 files (100.00%) getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)