test-conflict
17 lines
| 293 B
| text/plain
|
TextLexer
/ tests / test-conflict
|
r544 | #!/bin/sh | ||
|
r346 | |||
set -x | ||||
hg init | ||||
echo "nothing" > a | ||||
hg add a | ||||
hg commit -t ancestor -u test -d "0 0" | ||||
echo "something" > a | ||||
hg commit -t branch1 -u test -d "0 0" | ||||
hg co 0 | ||||
echo "something else" > a | ||||
hg commit -t branch2 -u test -d "0 0" | ||||
export HGMERGE=merge | ||||
|
r591 | hg up -m 1 | ||
|
r346 | hg id | ||
|
r392 | grep -Ev ">>>|<<<" a | ||
|
r346 | hg status | ||