Skip to content
Snippets Groups Projects
user avatar
Matt Mackall authored
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.
9f12d866
History
Name Last commit Last update