All pastes #801850 Raw Edit

Someone

public text v1 · immutable
#801850 ·published 2007-11-29 17:19 UTC
rendered paste body
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:        58997 |   65 |     19445
mtn: bytes in | bytes out | certs in | revs in
mtn:    7.9 k |     6.4 k |      4/4 |     1/1
mtn: successful exchange with monotone.openembedded.org
mtn: updating along branch 'org.openembedded.dev'
mtn: selected update target dd83c0ba4e83a6207462418b614431ce061d9481
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