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.
Showing
- mercurial/merge.py 3 additions, 3 deletionsmercurial/merge.py
- mercurial/subrepo.py 22 additions, 12 deletionsmercurial/subrepo.py
- tests/test-largefiles-update.t 1 addition, 1 deletiontests/test-largefiles-update.t
- tests/test-subrepo-git.t 3 additions, 3 deletionstests/test-subrepo-git.t
- tests/test-subrepo-svn.t 4 additions, 4 deletionstests/test-subrepo-svn.t
- tests/test-subrepo.t 13 additions, 13 deletionstests/test-subrepo.t
Loading
Please register or sign in to comment