merge: add conflict labels to merge command
Now that we present the conflict labels in prompts, it's useful to have better names than "local" and "other" for every command.
Showing
- mercurial/commands.py 3 additions, 1 deletionmercurial/commands.py
- mercurial/hg.py 3 additions, 2 deletionsmercurial/hg.py
- tests/test-commit-amend.t 32 additions, 32 deletionstests/test-commit-amend.t
- tests/test-conflict.t 12 additions, 12 deletionstests/test-conflict.t
- tests/test-keyword.t 2 additions, 2 deletionstests/test-keyword.t
- tests/test-merge-changedelete.t 68 additions, 38 deletionstests/test-merge-changedelete.t
- tests/test-merge-force.t 70 additions, 70 deletionstests/test-merge-force.t
- tests/test-merge-remove.t 1 addition, 1 deletiontests/test-merge-remove.t
- tests/test-merge-tools.t 16 additions, 16 deletionstests/test-merge-tools.t
- tests/test-merge-types.t 8 additions, 8 deletionstests/test-merge-types.t
- tests/test-merge7.t 2 additions, 2 deletionstests/test-merge7.t
- tests/test-rename-dir-merge.t 4 additions, 4 deletionstests/test-rename-dir-merge.t
- tests/test-rename-merge2.t 2 additions, 2 deletionstests/test-rename-merge2.t
- tests/test-resolve.t 6 additions, 0 deletionstests/test-resolve.t
- tests/test-subrepo-git.t 1 addition, 1 deletiontests/test-subrepo-git.t
- tests/test-subrepo.t 6 additions, 6 deletionstests/test-subrepo.t
Loading
Please register or sign in to comment