##// END OF EJS Templates
merge: use labels in subrepo merge...
merge: use labels in subrepo merge This is the last place that doesn't respect conflict labels in merge output. Teach subrepos to use subrepo merge output too.
Simon Farnsworth -
r30060:a145161d 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 ...