equal
deleted
inserted
replaced
|
1 Path conflict checking is currently disabled by default because of issue5716. |
|
2 Turn it on for this test. |
|
3 |
|
4 $ cat >> $HGRCPATH << EOF |
|
5 > [experimental] |
|
6 > merge.checkpathconflicts=True |
|
7 > EOF |
|
8 |
1 $ hg init repo |
9 $ hg init repo |
2 $ cd repo |
10 $ cd repo |
3 $ echo base > base |
11 $ echo base > base |
4 $ hg add base |
12 $ hg add base |
5 $ hg commit -m "base" |
13 $ hg commit -m "base" |
94 branch: default |
102 branch: default |
95 bookmarks: *file2 |
103 bookmarks: *file2 |
96 commit: (clean) |
104 commit: (clean) |
97 update: 1 new changesets, 2 branch heads (merge) |
105 update: 1 new changesets, 2 branch heads (merge) |
98 phases: 4 draft |
106 phases: 4 draft |
99 |
|