|
346
|
1 |
+ hg init
|
|
|
2 |
+ echo nothing
|
|
|
3 |
+ hg add a
|
|
|
4 |
+ hg commit -t ancestor -u test -d '0 0'
|
|
|
5 |
+ echo something
|
|
|
6 |
+ hg commit -t branch1 -u test -d '0 0'
|
|
|
7 |
+ hg co 0
|
|
|
8 |
+ echo 'something else'
|
|
|
9 |
+ hg commit -t branch2 -u test -d '0 0'
|
|
|
10 |
+ export HGMERGE=merge
|
|
|
11 |
+ HGMERGE=merge
|
|
|
12 |
+ hg -d up -m 1
|
|
|
13 |
merge: warning: conflicts during merge
|
|
|
14 |
resolving manifests
|
|
|
15 |
ancestor 1c6e5a12 local 35fedfab remote a5801785
|
|
|
16 |
a versions differ, resolve
|
|
|
17 |
working dir created .out, keeping
|
|
|
18 |
merging a
|
|
|
19 |
resolving a
|
|
|
20 |
file a: other d7250518 ancestor 68ba9db7
|
|
|
21 |
merging a failed!
|
|
|
22 |
+ hg id
|
|
|
23 |
32e80765+75234512+ tip
|
|
|
24 |
+ cat a
|
|
|
25 |
+ grep -v '>>>'
|
|
|
26 |
+ grep -v '<<<'
|
|
|
27 |
something else
|
|
|
28 |
=======
|
|
|
29 |
something
|
|
|
30 |
+ hg status
|
|
|
31 |
C a
|
|
|
32 |
? .out
|