equal
deleted
inserted
replaced
7 + hg co 0 |
7 + hg co 0 |
8 + echo 'something else' |
8 + echo 'something else' |
9 + hg commit -t branch2 -u test -d '0 0' |
9 + hg commit -t branch2 -u test -d '0 0' |
10 + export HGMERGE=merge |
10 + export HGMERGE=merge |
11 + HGMERGE=merge |
11 + HGMERGE=merge |
12 + hg -d up -m 1 |
12 + hg up -m 1 |
13 merge: warning: conflicts during merge |
13 merge: warning: conflicts during merge |
14 resolving manifests |
|
15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc |
|
16 a versions differ, resolve |
|
17 working dir created .out, keeping |
|
18 merging a |
14 merging a |
19 resolving a |
|
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
|
21 merging a failed! |
15 merging a failed! |
22 + hg id |
16 + hg id |
23 32e80765d7fe+75234512624c+ tip |
17 32e80765d7fe+75234512624c+ tip |
24 + grep -Ev '>>>|<<<' a |
18 + grep -Ev '>>>|<<<' a |
25 something else |
19 something else |