test-conflict.out
24 lines
| 445 B
| text/plain
|
TextLexer
/ tests / test-conflict.out
|
r346 | + hg init | ||
+ echo nothing | ||||
+ hg add a | ||||
+ hg commit -t ancestor -u test -d '0 0' | ||||
+ echo something | ||||
+ hg commit -t branch1 -u test -d '0 0' | ||||
+ hg co 0 | ||||
+ echo 'something else' | ||||
+ hg commit -t branch2 -u test -d '0 0' | ||||
+ export HGMERGE=merge | ||||
+ HGMERGE=merge | ||||
|
r591 | + hg up -m 1 | ||
|
r346 | merge: warning: conflicts during merge | ||
merging a | ||||
merging a failed! | ||||
+ hg id | ||||
|
r374 | 32e80765d7fe+75234512624c+ tip | ||
|
r392 | + grep -Ev '>>>|<<<' a | ||
|
r346 | something else | ||
======= | ||||
something | ||||
+ hg status | ||||
C a | ||||
? .out | ||||