im.pidgin.pidgin multiple heads, conflicting revisions

[Jeff Connelly]

On 9/5/07, Ka-Hing Cheung <khc at hxbc.us> wrote:
>
> On Wed, 2007-09-05 at 22:48 -0700, Jeff Connelly wrote:
> > One of datallah's revisions is conflicting with one of mine (or mine
> > is conflicting with his):
> >
> > $ mtn heads
> > mtn: branch 'im.pidgin.pidgin' is currently unmerged:
> > cce02af7eb2fb114cb0f640979554b7de3a80e96 jeff2 at soc.pidgin.im 2007-09-05T04:52:33
> > db5ad5300e844751f9abf8702f4e4a8369dfef8e datallah at pidgin.im 2007-09-05T23:51:16
> >
>
> there, merged
Thank you!

Shkutkov, I have kdiff3 and vim but unfortunately when Cygwin Monotone
invokes them, neither program can find the files to compare. I have
not yet investigated why this is, also meld works great under Linux
but unfortunately my Linux installation is unusable due to disk
corruption (don't worry, msimprpl is safe). Hopefully I'll have these
issues cleared up soon and will be able to merge again, but in the
meantime im.pidgin.pidgin is single-headed again!

-Jeff