mercurial/__init__.py
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 28 Apr 2007 17:55:45 -0300
changeset 4387 93a4e72b4f83
parent 0 9117c6561b0b
child 27220 4374d819ccd5
permissions -rw-r--r--
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.