##// END OF EJS Templates
status: process `from_p2` file the same as `merged` one...
status: process `from_p2` file the same as `merged` one What matters here is that the file constains information coming from the second parent and should be considered `modified` on plain `hg status. So we can process `from_p2` file sooner. It also highlight that we probably don't need the merged/from_p2 distinction at higher level. Differential Revision: https://phab.mercurial-scm.org/D11591
marmoute -
r48959:142e9f0a default
Show More
Name Size Modified Last Commit Author
/ hgext / fastannotate
__init__.py Loading ...
commands.py Loading ...
context.py Loading ...
error.py Loading ...
formatter.py Loading ...
protocol.py Loading ...
revmap.py Loading ...
support.py Loading ...