Mercurial > hg

comparison tests/test-merge-types.out @ 11716:db426935fa94 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 overwrite None partial False 6 overwrite None partial False
7 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c 7 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
8 conflicting flags for a 8 conflicting flags for a
9 (n)one, e(x)ec or sym(l)ink? n 9 (n)one, e(x)ec or sym(l)ink? n
10 a: update permissions -> e 10 a: update permissions -> e
11 update: a 1/1 files (100.00%) 11 updating: a 1/1 files (100.00%)
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 (branch merge, don't forget to commit) 13 (branch merge, don't forget to commit)
14 % symlink is local parent, executable is other 14 % symlink is local parent, executable is other
15 a has no flags (default for conflicts) 15 a has no flags (default for conflicts)
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
19 overwrite None partial False 19 overwrite None partial False
20 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f 20 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
21 conflicting flags for a 21 conflicting flags for a
22 (n)one, e(x)ec or sym(l)ink? n 22 (n)one, e(x)ec or sym(l)ink? n
23 a: remote is newer -> g 23 a: remote is newer -> g
24 update: a 1/1 files (100.00%) 24 updating: a 1/1 files (100.00%)
25 getting a 25 getting a
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 (branch merge, don't forget to commit) 27 (branch merge, don't forget to commit)
28 % symlink is other parent, executable is local 28 % symlink is other parent, executable is local
29 a has no flags (default for conflicts) 29 a has no flags (default for conflicts)