Mercurial > hg
comparison mercurial/minirst.py @ 30060:a145161debed
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.
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Sat, 08 Oct 2016 01:25:28 -0700 |
| parents | aaabed77791a |
| children | bff77a693531 |
comparison
equal
deleted
inserted
replaced
| 30059:6ffb7e0249f4 | 30060:a145161debed |
|---|