mercurial/pure/__init__.py
author Matt Mackall <mpm@selenic.com>
Wed, 30 Apr 2014 14:19:01 -0500
branchstable
changeset 21203 9f12d8665c7b
parent 16438 28a90cdf0ca0
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines: