##// END OF EJS Templates
dirstate: use 'm' state in otherparent to reduce ambiguity...
dirstate: use 'm' state in otherparent to reduce ambiguity In rebase-like operations where we abandon the second parent, we can correctly fix up the state in setparents.

File last commit:

r19426:e4318468 default
r22896:7e9cbb9c default
Show More
common.txt
8 lines | 240 B | text/plain | TextLexer
.. Common link and substitution definitions.
.. |hg(1)| replace:: **hg**\ (1)
.. _hg(1): hg.1.html
.. |hgrc(5)| replace:: **hgrc**\ (5)
.. _hgrc(5): hgrc.5.html
.. |hgignore(5)| replace:: **hgignore**\ (5)
.. _hgignore(5): hgignore.5.html