All pastes #829656 Raw Edit

Something

public text v1 · immutable
#829656 ·published 2007-12-23 10:31 UTC
rendered paste body
mtn: updating along branch 'org.openembedded.dev'
mtn: selected update target d8bfa63aa913e7227790ba2d02253cfbecce61ab
mtn: help required for 3-way merge
mtn: [ancestor] packages/xserver-common/xserver-common_1.18.bb
mtn: [    left] packages/xserver-common/xserver-common_1.18.bb
mtn: [   right] packages/xserver-common/xserver-common_1.18.bb
mtn: [  merged] packages/xserver-common/xserver-common_1.18.bb
mtn: warning: [string "<std hooks>"]:796: bad argument #2 to 'format' (string expected, got nil)
mtn: error: merge failed due to unresolved conflicts