146 |
sstat = "Needs Patch"; |
sstat = "Needs Patch"; |
147 |
break; |
break; |
148 |
case T_CONFLICT: |
case T_CONFLICT: |
|
/* I _think_ that "unresolved" is correct; that if it has |
|
|
been resolved then the status will change. But I'm not |
|
|
sure about that. */ |
|
149 |
sstat = "Unresolved Conflict"; |
sstat = "Unresolved Conflict"; |
150 |
break; |
break; |
151 |
case T_ADDED: |
case T_ADDED: |
155 |
sstat = "Locally Removed"; |
sstat = "Locally Removed"; |
156 |
break; |
break; |
157 |
case T_MODIFIED: |
case T_MODIFIED: |
158 |
if ( vers->ts_conflict |
if (file_has_markers (finfo)) |
|
&& ( file_has_conflict ( finfo, vers->ts_conflict ) |
|
|
|| file_has_markers ( finfo ) ) ) |
|
159 |
sstat = "File had conflicts on merge"; |
sstat = "File had conflicts on merge"; |
160 |
else |
else |
161 |
/* Note that we do not re Register() the file when we spot |
/* Note that we do not re Register() the file when we spot |