Mercurial > hg > mercurial-crew-with-dirclash
view templates/map-cmdline.compact @ 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 | 8f565af14095 |
children |
line wrap: on
line source
changeset = '{rev}{tags}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n' changeset_quiet = '{rev}:{node|short}\n' start_tags = '[' tag = '{tag},' last_tag = '{tag}]' start_parents = ':' parent = '{rev},' last_parent = '{rev}'