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

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

run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default
r4387:93a4e72b default
Show More
test-merge3
10 lines | 158 B | text/plain | TextLexer
/ tests / test-merge3
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"