rendered paste body$ mtn pull && mtn update
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to monotone.openembedded.org
mtn: finding items to synchronize:
mtn: certificates | keys | revisions
mtn: 60199 | 65 | 19835
mtn: bytes in | bytes out | certs in | revs in
mtn: 67.0 k | 46.4 k | 45/45 | 11/11
mtn: successful exchange with monotone.openembedded.org
mtn: updating along branch 'org.openembedded.dev'
mtn: selected update target 1b96e689e33845c251e1db7e51f28be0d2d037f8
mtn: help required for 3-way merge
mtn: [ancestor] conf/distro/include/sane-srcrevs.inc
mtn: [ left] conf/distro/include/sane-srcrevs.inc
mtn: [ right] conf/distro/include/sane-srcrevs.inc
mtn: [ merged] conf/distro/include/sane-srcrevs.inc
mtn: warning: [string "<std hooks>"]:796: bad argument #2 to 'format' (string expected, got nil)
mtn: error: merge failed due to unresolved conflicts
user0815@box0:/media/archiv/OE/org.openembedded.dev$ mtn --version
monotone 0.37 (base revision: c21eefc002b8f9c430e9f4cc16c4af7b852f54ec)