Mercurial > hg
view tests/test-merge-symlinks.out @ 12388:75f044d4dbf5
minirst: Support for admonitions
The old asciidoc format supported something like this,
this is why there is NOTE: scattered here and there.
author | Erik Zielke <ez@aragost.com> |
---|---|
date | Wed, 22 Sep 2010 15:51:59 +0200 |
parents | 36794dbe66a3 |
children |
line wrap: on
line source
3 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge heads HG_FILE l HG_MY_ISLINK 1 HG_OTHER_ISLINK 0 HG_BASE_ISLINK 0 merging l 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % merge working directory 1 files updated, 0 files merged, 1 files removed, 0 files unresolved HG_FILE l2 HG_MY_ISLINK 1 HG_OTHER_ISLINK 0 HG_BASE_ISLINK 0 merging l2 0 files updated, 1 files merged, 0 files removed, 0 files unresolved