change tests to use simplemerge by default
Showing
- tests/run-tests.py 8 additions, 7 deletionstests/run-tests.py
- tests/test-annotate 2 additions, 0 deletionstests/test-annotate
- tests/test-backout 2 additions, 0 deletionstests/test-backout
- tests/test-conflict 0 additions, 1 deletiontests/test-conflict
- tests/test-conflict.out 1 addition, 1 deletiontests/test-conflict.out
- tests/test-globalopts 1 addition, 1 deletiontests/test-globalopts
- tests/test-install 1 addition, 1 deletiontests/test-install
- tests/test-merge-commit 0 additions, 3 deletionstests/test-merge-commit
- tests/test-merge-local 2 additions, 2 deletionstests/test-merge-local
- tests/test-merge-local.out 1 addition, 1 deletiontests/test-merge-local.out
- tests/test-merge-revert 1 addition, 1 deletiontests/test-merge-revert
- tests/test-merge-revert2 1 addition, 1 deletiontests/test-merge-revert2
- tests/test-merge-revert2.out 1 addition, 1 deletiontests/test-merge-revert2.out
- tests/test-merge7 2 additions, 2 deletionstests/test-merge7
- tests/test-merge7.out 2 additions, 2 deletionstests/test-merge7.out
- tests/test-up-local-change 2 additions, 0 deletionstests/test-up-local-change
Loading
Please register or sign in to comment