view templates/map-cmdline.compact @ 6518:92ccccb55ba3

resolve: new command

- add basic resolve command functionality
- point failed update and merge at resolve

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}'