##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: add test of rebase with conflict in merge commit...
tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824
Matt Harbison - - Load All Authors

File last commit:

r44031:2e017696 default
r44816:7f7c8521 default
Show More
common.txt
8 lines | 240 B | text/plain | TextLexer
/ mercurial / helptext / common.txt
History | Annotation | Raw |Copy content |Copy permalink
.. 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