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 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 |
12 (branch merge, don't forget to commit) |
13 (branch merge, don't forget to commit) |
13 % symlink is local parent, executable is other |
14 % symlink is local parent, executable is other |
14 a has no flags (default for conflicts) |
15 a has no flags (default for conflicts) |
15 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 |
18 overwrite None partial False |
19 overwrite None partial False |
19 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f |
20 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f |
20 conflicting flags for a |
21 conflicting flags for a |
21 (n)one, e(x)ec or sym(l)ink? n |
22 (n)one, e(x)ec or sym(l)ink? n |
22 a: remote is newer -> g |
23 a: remote is newer -> g |
|
24 update: a 1/1 files (100.00%) |
23 getting a |
25 getting a |
24 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 |
25 (branch merge, don't forget to commit) |
27 (branch merge, don't forget to commit) |
26 % symlink is other parent, executable is local |
28 % symlink is other parent, executable is local |
27 a has no flags (default for conflicts) |
29 a has no flags (default for conflicts) |