##// END OF EJS Templates
ancestor: silence multiple ancestor warning outside of merge (issue4234)...
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.
Matt Mackall -
r21203:9f12d866 stable
Show More
Name Size Modified Last Commit Author
/ mercurial / httpclient
__init__.py Loading ...
_readers.py Loading ...
socketutil.py Loading ...