Show More
| @@ -139,6 +139,12 b' resolve --all should re-merge all unreso' | |||||
| 139 | merging file2 |
|
139 | merging file2 | |
| 140 | warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
|
140 | warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') | |
| 141 | [1] |
|
141 | [1] | |
|
|
142 | $ cat file1.orig | |||
|
|
143 | foo | |||
|
|
144 | baz | |||
|
|
145 | $ cat file2.orig | |||
|
|
146 | foo | |||
|
|
147 | baz | |||
| 142 | $ grep '<<<' file1 > /dev/null |
|
148 | $ grep '<<<' file1 > /dev/null | |
| 143 | $ grep '<<<' file2 > /dev/null |
|
149 | $ grep '<<<' file2 > /dev/null | |
| 144 |
|
150 | |||
General Comments 0
You need to be logged in to leave comments.
Login now