On Wed, Aug 10, 2005 at 12:20:33AM +0200, Tomas Fasth wrote:
[EMAIL PROTECTED]:~/work/monotone/monotone/debian$ mt merge
monotone: starting with revision 1 / 2
monotone: merging with revision 2 / 2
monotone: [source] 8f5da2ff98cf729256cec8d2ccca3a0c8fc7bfa9
monotone: [source]
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello
I tried to merge my version of debian/changelog with the latest pull
from venge.net and got an error as described in the subject line. To
simplify the case I initially only refer to the changelog versions
in the outline below. More details