Show More
@@ -118,8 +118,8 b' resolve --all should re-merge all unreso' | |||||
118 | warning: conflicts during merge. |
|
118 | warning: conflicts during merge. | |
119 | merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
119 | merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark') | |
120 | [1] |
|
120 | [1] | |
121 |
$ grep |
|
121 | $ grep '<<<' file1 > /dev/null | |
122 |
$ grep |
|
122 | $ grep '<<<' file2 > /dev/null | |
123 |
|
123 | |||
124 | resolve <file> should re-merge file |
|
124 | resolve <file> should re-merge file | |
125 | $ echo resolved > file1 |
|
125 | $ echo resolved > file1 | |
@@ -127,7 +127,7 b' resolve <file> should re-merge file' | |||||
127 | warning: conflicts during merge. |
|
127 | warning: conflicts during merge. | |
128 | merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
128 | merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') | |
129 | [1] |
|
129 | [1] | |
130 |
$ grep |
|
130 | $ grep '<<<' file1 > /dev/null | |
131 |
|
131 | |||
132 | resolve <file> should do nothing if 'file' was marked resolved |
|
132 | resolve <file> should do nothing if 'file' was marked resolved | |
133 | $ echo resolved > file1 |
|
133 | $ echo resolved > file1 |
General Comments 0
You need to be logged in to leave comments.
Login now