view tests/test-merge4.out @ 9202:82de0bb056d7

bookmarks: use reST syntax for literal block
author Martin Geisler <mg@lazybytes.net>
date Thu, 23 Jul 2009 00:02:06 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)