##// END OF EJS Templates
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()...
merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Differential Revision: https://phab.mercurial-scm.org/D8824

File last commit:

r44031:2e017696 default
r45843:00e9c5ed 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