302 |
else if (entdata->timestamp |
else if (entdata->timestamp |
303 |
&& entdata->timestamp[0] == '=') |
&& entdata->timestamp[0] == '=') |
304 |
mark_unchanged (vers_ts); |
mark_unchanged (vers_ts); |
305 |
|
else if (entdata->conflict |
306 |
|
&& entdata->conflict[0] == '=') |
307 |
|
{ |
308 |
|
/* These just need matching content. Might as well minimize it. */ |
309 |
|
vers_ts->ts_user = xstrdup (""); |
310 |
|
vers_ts->ts_conflict = xstrdup (""); |
311 |
|
} |
312 |
else if (entdata->timestamp |
else if (entdata->timestamp |
313 |
&& (entdata->timestamp[0] == 'M' |
&& (entdata->timestamp[0] == 'M' |
314 |
|| entdata->timestamp[0] == 'D') |
|| entdata->timestamp[0] == 'D') |