Show More
@@ -1,6 +1,10 b'' | |||||
1 | test merge-tools configuration - mostly exercising filemerge.py |
|
1 | test merge-tools configuration - mostly exercising filemerge.py | |
2 |
|
2 | |||
3 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
|
3 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test | |
|
4 | $ cat >> $HGRCPATH << EOF | |||
|
5 | > [ui] | |||
|
6 | > merge= | |||
|
7 | > EOF | |||
4 | $ hg init repo |
|
8 | $ hg init repo | |
5 | $ cd repo |
|
9 | $ cd repo | |
6 |
|
10 |
General Comments 0
You need to be logged in to leave comments.
Login now