##// END OF EJS Templates
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.

File last commit:

r3719:199dcb97 default
r4387:93a4e72b default
Show More
test-issue433
10 lines | 144 B | text/plain | TextLexer
#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue433
hg init a
cd a
echo a > a
hg commit -Ama
hg parents -r 0 doesnotexist
true