Show More
| @@ -1,3 +1,15 b'' | |||||
|
|
1 | #testcases newfilenode old | |||
|
|
2 | ||||
|
|
3 | #if newfilenode | |||
|
|
4 | Enable the config option | |||
|
|
5 | ------------------------ | |||
|
|
6 | ||||
|
|
7 | $ cat >> $HGRCPATH <<EOF | |||
|
|
8 | > [experimental] | |||
|
|
9 | > merge-track-salvaged = True | |||
|
|
10 | > EOF | |||
|
|
11 | #endif | |||
|
|
12 | ||||
| 1 | Tests for change/delete conflicts, including: |
|
13 | Tests for change/delete conflicts, including: | |
| 2 | b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again |
|
14 | b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again | |
| 3 | (issue897) |
|
15 | (issue897) | |
General Comments 0
You need to be logged in to leave comments.
Login now