##// 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:

r2175:b2ae81a7 default
r4387:93a4e72b default
Show More
test-lock-badness.out
5 lines | 160 B | text/plain | TextLexer
/ tests / test-lock-badness.out
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
pushing to ../a
abort: could not lock repository ../a: Permission denied