"ambiguous merge - picked m action"

[Yaron Cohen-Tal]

Thanx!

Perhaps u should add the msg that I've got to that wiki page so that
googling the msg will catch the wiki page? Currently google doesn't give
any relevant results.

On Wed, Aug 24, 2016 at 1:22 AM, Matt Mackall <mpm at selenic.com> wrote:

> On Mon, 2016-08-22 at 11:00 +0300, Yaron Cohen-Tal wrote:
> > Hi,
> >
> > What does that mean?
>
> You have a complicated merge that can be resolved in multiple ways, we
> pick the
> one that's "safest".
>
> https://www.mercurial-scm.org/wiki/BidMerge
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20160824/7070a420/attachment-0002.html>