filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always have the "base" label defined. Differential Revision: https://phab.mercurial-scm.org/D12016
Showing
- mercurial/filemerge.py 7 additions, 18 deletionsmercurial/filemerge.py
- tests/test-annotate.t 4 additions, 4 deletionstests/test-annotate.t
- tests/test-diff-change.t 1 addition, 1 deletiontests/test-diff-change.t
- tests/test-fastannotate-hg.t 2 additions, 2 deletionstests/test-fastannotate-hg.t
- tests/test-merge-changedelete.t 1 addition, 1 deletiontests/test-merge-changedelete.t
- tests/test-merge-force.t 10 additions, 10 deletionstests/test-merge-force.t
- tests/test-merge-tools.t 4 additions, 4 deletionstests/test-merge-tools.t
- tests/test-rebase-collapse.t 2 additions, 2 deletionstests/test-rebase-collapse.t
- tests/test-rebase-conflicts.t 1 addition, 1 deletiontests/test-rebase-conflicts.t
- tests/test-update-branches.t 1 addition, 1 deletiontests/test-update-branches.t
Loading
Please register or sign in to comment