Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hgweb/request.py @ 4385:93a4e72b4f83
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 28 Apr 2007 17:55:45 -0300 |
parents | ca639faa38a2 |
children | ff7253a0d1da |
comparison
equal
deleted
inserted
replaced
4384:1386a9cffc88 | 4385:93a4e72b4f83 |
---|