| changeset 40517 | 1736450cd1df |
| parent 39723 | 5abc47d4ca6b |
| child 40528 | 86dfae98a3a2 |
| 40516:37e75be0b019 | 40517:1736450cd1df |
|---|---|
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 |
7 revision 0 |
11 revision 0 |
8 |
12 |