All pastes #807236 Raw Edit

Untitled

public text v1 · immutable
·published 2007-12-06 11:03 UTC
rendered paste body
12:02 hrw@home:org.openembedded$ mtn merge
mtn: 2 heads on branch 'org.openembedded.dev'
mtn: [left]  56286ad1242ca609acecef5bc84883c2f9de92bb
mtn: [right] 9981f4c01256065169ba2a4cd1e33f5e6b565e61
mtn: help required for 3-way merge
mtn: [ancestor] packages/mozilla/firefox_2.0.0.3.bb
mtn: [    left] packages/mozilla/firefox_2.0.0.3.bb
mtn: [   right] packages/mozilla/firefox_2.0.0.3.bb
mtn: [  merged] packages/mozilla/firefox_2.0.0.3.bb
mtn: warning: [string "<std hooks>"]:796: bad argument #2 to 'format' (string expected, got nil)
mtn: error: merge failed due to unresolved conflicts