##// 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
/ mercurial / utils
__init__.py Loading ...
cborutil.py Loading ...
compression.py Loading ...
dateutil.py Loading ...
hashutil.py Loading ...
memorytop.py Loading ...
procutil.py Loading ...
repoviewutil.py Loading ...
resourceutil.py Loading ...
storageutil.py Loading ...
stringutil.py Loading ...
urlutil.py Loading ...