Merge problems after moving directories in a branch

[Gustavo Narea]

Hi, Matt.

On 01/04/10 18:30, Matt Mackall wrote:
> Send us a log with merge --debug.
>   

It's attached to this email.

Cheers,

-- 
Gustavo Narea.
Software Developer.
2degrees, Ltd. <http://www.2degreesnetwork.com/>.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pull-output
URL: <http://selenic.com/pipermail/mercurial/attachments/20100406/3031de8a/attachment-0001.txt>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merge-output
URL: <http://selenic.com/pipermail/mercurial/attachments/20100406/3031de8a/attachment-0001.asc>