copies: remove unnecessary override of p[12]copies() in workingctx
The implementation is identical to the version inherited from basectx.
Differential Revision: https://phab.mercurial-scm.org/D6647
tests: properly position conditional output on Windows in test-subrepo.t
The test runner doesn't always guess the right location when optional output is
missing. This goes with
f6540aba8e3e.
Differential Revision: https://phab.mercurial-scm.org/D6640
abort: removed labels argument from abortmerge()
Labels are used to label the code that belongs to `working copy` and `merge rev`
in case of a conflicted state.
No such labelling is required while aborting merge as conflicted parts
are reverted to normal.
Differential Revision: https://phab.mercurial-scm.org/D6638