filemerge: add debug output for whether this is a change/delete conflict
Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.
Showing
- mercurial/filemerge.py 2 additions, 2 deletionsmercurial/filemerge.py
- tests/test-backout.t 1 addition, 1 deletiontests/test-backout.t
- tests/test-copy-move-merge.t 2 additions, 2 deletionstests/test-copy-move-merge.t
- tests/test-double-merge.t 2 additions, 2 deletionstests/test-double-merge.t
- tests/test-graft.t 3 additions, 3 deletionstests/test-graft.t
- tests/test-issue672.t 2 additions, 2 deletionstests/test-issue672.t
- tests/test-merge-commit.t 2 additions, 2 deletionstests/test-merge-commit.t
- tests/test-merge-criss-cross.t 2 additions, 2 deletionstests/test-merge-criss-cross.t
- tests/test-merge-types.t 6 additions, 6 deletionstests/test-merge-types.t
- tests/test-merge7.t 2 additions, 2 deletionstests/test-merge7.t
- tests/test-rename-merge1.t 1 addition, 1 deletiontests/test-rename-merge1.t
- tests/test-rename-merge2.t 71 additions, 71 deletionstests/test-rename-merge2.t
- tests/test-subrepo.t 2 additions, 2 deletionstests/test-subrepo.t
- tests/test-up-local-change.t 6 additions, 6 deletionstests/test-up-local-change.t
Loading
Please register or sign in to comment