jens@debian31:~/dm7025$ make -f Makefile-opendreambox image
/usr/bin/monotone --version | grep -q "monotone 0.24" || { echo "Did not find monotone 0.24"; exit 1; }
Initial database already existing, ok.
/usr/bin/monotone pull --db=oe.db ewi546.ewi.utwente.nl org.openembedded.dreambox
monotone: doing anonymous pull; use -kKEYNAME if you need authentication
monotone: connecting to ewi546.ewi.utwente.nl
monotone: finding items to synchronize:
monotone:   certs |    keys | revisions
monotone:  11.439 |      40 |     3.752
monotone: bytes in | bytes out | certs in | revs in | revs written
monotone:      196 |     1.127 |        0 |       0 |            0
monotone: successful exchange with ewi546.ewi.utwente.nl
[ ! -e openembedded ] && /usr/bin/monotone checkout --db=oe.db --branch=org.openembedded.dreambox openembedded || echo "Already checked out, ok."
Already checked out, ok.
cd openembedded; monotone --db=../oe.db update
monotone: selected update target e1ac9d7bfc8c8565ff10bb235b346296aad01455
monotone: help required for 3-way merge
monotone: [ancestor] packages/enigma2/enigma2.bb
monotone: [    left] packages/enigma2/enigma2.bb
monotone: [   right] packages/enigma2/enigma2.bb
monotone: [  merged] packages/enigma2/enigma2.bb
No external 3-way merge command found.
You may want to check that $EDITOR is set to an editor that supports 3-way merge,
set this explicitly in your get_preferred_merge3_command hook,
or add a 3-way merge program to your path.


monotone: misuse: merge of 'packages/enigma2/enigma2.bb' : 'dd64b350e1107215e445971f7e3ef791bae0d89e' -> 'e7686f1f8f132b2783c7a6cf8a161df3b678670e' vs '8622573d46151dac0c944e39a39e65607955b8b1' failed
make: *** [openembedded] Fehler 1
jens@debian31:~/dm7025$