| changeset 23172 | e955549cd045 |
| parent 22521 | 3f948469bac0 |
| child 35393 | 4441705b7111 |
| 23171:8afae1d5d108 | 23172:e955549cd045 |
|---|---|
1 Setup extension: |
1 Setup extension: |
2 |
2 |
3 $ echo "[extensions]" >> $HGRCPATH |
3 $ cat <<EOF >> $HGRCPATH |
4 $ echo "mq =" >> $HGRCPATH |
4 > [extensions] |
5 $ echo "[mq]" >> $HGRCPATH |
5 > mq = |
6 $ echo "git = keep" >> $HGRCPATH |
6 > [mq] |
7 > git = keep |
|
8 > EOF |
|
7 |
9 |
8 Test merge with mq changeset as the second parent: |
10 Test merge with mq changeset as the second parent: |
9 |
11 |
10 $ hg init m |
12 $ hg init m |
11 $ cd m |
13 $ cd m |