Skip to content
Snippets Groups Projects
Commit a145161debed authored by Simon Farnsworth's avatar Simon Farnsworth
Browse files

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.
parent 6ffb7e0249f4
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment