comparison tests/test-flags.t @ 21203:9f12d8665c7b stable

ancestor: silence multiple ancestor warning outside of merge (issue4234) The current situation is a bit of a layering violation as merge-specific knowledge is pushed down to lower layers and leaks merge assumptions into other code paths. Here, we simply silence the warning with a hack. Both the warning and the hack will probably go away in the near future when bid merge is made the default.
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Apr 2014 14:19:01 -0500
parents 557c8522aec0
children 7a9cbb315d84
comparison
equal deleted inserted replaced
21202:c04e5e937139 21203:9f12d8665c7b