[PATCH] detect conflicts between merged remote files and directories (issue29)

[Bryan O'Sullivan]

On Tue, Oct 23, 2012 at 5:09 PM, Evgeniy Makeev <evgeniym at fb.com> wrote:

> detect conflicts between merged remote files and directories (issue29)
>

This looks great. Thanks for persisting through the reviews!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121023/99791487/attachment.html>