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

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

Incorporated most of Aron Griffis suggestions for sh compatibility.
Incorporated most of Aron Griffis suggestions for sh compatibility.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r800:ec85f9e6 default
r804:19388dcb default
Show More
test-conflict
16 lines | 271 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 "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status