Mercurial > hg
view templates/map-cmdline.compact @ 5708:f6bf89722e29
merge: add flag merging intelligence
- properly handle all 27 combinations of flags
- prompt on conflicts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 27 Dec 2007 22:47:44 -0600 |
parents | 8f565af14095 |
children | b24290c72a1d |
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}'