merge: give a special message for internal:merge failure (issue3105)
Showing
- mercurial/filemerge.py 5 additions, 1 deletionmercurial/filemerge.py
- tests/test-add.t 1 addition, 1 deletiontests/test-add.t
- tests/test-commit-unresolved.t 1 addition, 1 deletiontests/test-commit-unresolved.t
- tests/test-conflict.t 1 addition, 1 deletiontests/test-conflict.t
- tests/test-convert-svn-sink.t 1 addition, 1 deletiontests/test-convert-svn-sink.t
- tests/test-graft.t 1 addition, 1 deletiontests/test-graft.t
- tests/test-keyword.t 1 addition, 1 deletiontests/test-keyword.t
- tests/test-lfconvert.t 1 addition, 1 deletiontests/test-lfconvert.t
- tests/test-log.t 2 additions, 2 deletionstests/test-log.t
- tests/test-merge-local.t 3 additions, 3 deletionstests/test-merge-local.t
- tests/test-merge-revert2.t 1 addition, 1 deletiontests/test-merge-revert2.t
- tests/test-merge-tools.t 1 addition, 1 deletiontests/test-merge-tools.t
- tests/test-merge7.t 2 additions, 2 deletionstests/test-merge7.t
- tests/test-merge9.t 1 addition, 1 deletiontests/test-merge9.t
- tests/test-mq-qnew.t 2 additions, 2 deletionstests/test-mq-qnew.t
- tests/test-rebase-abort.t 2 additions, 2 deletionstests/test-rebase-abort.t
- tests/test-rebase-check-restore.t 2 additions, 2 deletionstests/test-rebase-check-restore.t
- tests/test-rebase-conflicts.t 1 addition, 1 deletiontests/test-rebase-conflicts.t
- tests/test-rebase-detach.t 1 addition, 1 deletiontests/test-rebase-detach.t
- tests/test-rebase-interruptions.t 3 additions, 3 deletionstests/test-rebase-interruptions.t
Loading
Please register or sign in to comment