Mercurial > hg > mercurial-crew-with-dirclash
comparison templates/gitweb/filediff.tmpl @ 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 | 537a93cafa79 |
| children | faf2fa0f3fff |
comparison
equal
deleted
inserted
replaced
| 4384:1386a9cffc88 | 4385:93a4e72b4f83 |
|---|