Mercurial > hg
comparison tests/test-issue522.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 |
comparison
equal
deleted
inserted
replaced
| 11715:4f9dfb54c8b5 | 11716:db426935fa94 |
|---|---|
| 6 bar | 6 bar |
| 7 resolving manifests | 7 resolving manifests |
| 8 overwrite None partial False | 8 overwrite None partial False |
| 9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee | 9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
| 10 foo: remote is newer -> g | 10 foo: remote is newer -> g |
| 11 update: foo 1/1 files (100.00%) | 11 updating: foo 1/1 files (100.00%) |
| 12 getting foo | 12 getting foo |
| 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 14 (branch merge, don't forget to commit) | 14 (branch merge, don't forget to commit) |
| 15 n 0 -2 unset foo | 15 n 0 -2 unset foo |
| 16 M foo | 16 M foo |