Mercurial > hg
comparison Makefile @ 21125:e94e90a4526e
context: tell when .ancestor picks one of multiple common ancestors heads
Show a message like
note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5
So far this is just a warning - there is nothing the user can do to select
another ancestor.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 17 Apr 2014 17:32:04 +0200 |
parents | 1bc68ff4e0a2 |
children | 54d7657d7d1e |
comparison
equal
deleted
inserted
replaced
21124:a65714215377 | 21125:e94e90a4526e |
---|