Mercurial > hg
view tests/test-merge5.out @ 6177:673d8a6bc709
Renamed "manifest" to "files" in web templates.
manifest.tmpl is still used, so people having their own templates don't have
to change them. "cmd=manifest" still works, new style URLs are not affected,
because they already used "/file/".
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 26 Feb 2008 22:42:37 +0100 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes