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

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

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
various - - Load All Authors

File last commit:

r15168:cfccd3be default
r48959:142e9f0a default
Show More
CONTRIBUTORS
4 lines | 172 B | text/plain | TextLexer
/ hgext / largefiles / CONTRIBUTORS
History | Annotation | Raw |Copy content |Copy permalink
Greg Ward, author of the original bfiles extension
Na'Tosha Bard of Unity Technologies
Fog Creek Software
Special thanks to the University of Toronto and the UCOSP program