im.pidgin.pidgin multiple heads, conflicting revisions

[Shkutkov Michael]

Jeff Connelly wrote:
> One of datallah's revisions is conflicting with one of mine (or mine
> is conflicting with his):
>
>   

> Any idea why this is happening and how to fix it? Anyone want to
> volunteer to fix it? :-) Unfortunately my computer is almost on its
> way out (Linux installation corrupt, shuts off if high processor
> usage, and other problems, but I plan on getting a new computer in the
> future), otherwise I'd try to merge it.
>
>
>   
I guess it's not datallah's revision conflicting with yours, his 
revision was the last and that's all.
Someone has changed myspace.c in i.p.p and this changes conflict with yours.
You simply should install one of merge tools
* kdiff3
* xxdiff
* opendiff
* tortoise
* emacs
* vim
* meld
* diffutils

and resolve conflicts.

-- 
With best regards,
Shkutkov Michael