##// END OF EJS Templates
merge: add conflict labels to merge command...
merge: add conflict labels to merge command Now that we present the conflict labels in prompts, it's useful to have better names than "local" and "other" for every command.
Simon Farnsworth -
r30062:940c05b2 default
Show More
Name Size Modified Last Commit Author
/ mercurial / help / internals
bundles.txt Loading ...
changegroups.txt Loading ...
requirements.txt Loading ...
revlogs.txt Loading ...
wireprotocol.txt Loading ...