[PATCH 5 of 5] merge: add more thorough tests for --force

Martin von Zweigbergk martinvonz at google.com
Tue Dec 2 00:57:30 CST 2014


On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk <
martinvonz at google.com> wrote:

> +# Notes:
> +# - local didn't really change content1_missing_*_content1-tracked, so
> +#   remote could potentially be chosen
>

Mads has now addressed this issue. I have rebased locally. Let me know when
you want me to post the rebased version.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141202/602c0598/attachment.html>


More information about the Mercurial-devel mailing list