Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 1913:74cf2b2f43d4
fix some things people wanted to be cleaner.
rename --map-file to --style.
no more -t alias for --template.
update docs.
rename template entry in map files to changelog.
if --verbose, use changelog_verbose if there, else changelog.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Sat, 04 Mar 2006 12:40:10 -0800 |
| parents | 5a034646e472 |
| children | 7544700fd931 |