Mercurial > hg
diff tests/test-merge-types.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Fri, 30 Jul 2010 10:32:24 +0300 |
| parents | ba5e508b5e92 |
| children |
line wrap: on
line diff
--- a/tests/test-merge-types.out Sat Jul 10 21:23:00 2010 +0200 +++ b/tests/test-merge-types.out Fri Jul 30 10:32:24 2010 +0300 @@ -8,7 +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%) +updating: 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 @@ -21,7 +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%) +updating: 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)