##// END OF EJS Templates
Add notes about configuring a merge program
Add notes about configuring a merge program

File last commit:

r4365:46280c00 default
r4386:1386a9cf default
Show More
test-conflict
15 lines | 259 B | text/plain | TextLexer
#!/bin/sh
hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status