##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix speed regression in mdiff caused by line split bugfix.
fix speed regression in mdiff caused by line split bugfix.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default
r2251:35fb62a3 0.9 default
Show More
test-conflict
16 lines | 289 B | text/plain | TextLexer
/ tests / test-conflict
History | Annotation | Raw |Copy content |Copy permalink
#!/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"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status