im.pidgin.pidgin multiple heads, conflicting revisions

[Ka-Hing Cheung]

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