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

r4110:20af6a2f default
r4387:93a4e72b default
Show More
test-context.py.out
1 line | 32 B | text/plain | TextLexer
workingfilectx.date = (1000, 0)