324 |
#else |
#else |
325 |
/* Files with conflict markers and new timestamps fall through |
/* Files with conflict markers and new timestamps fall through |
326 |
* here, but they need to. T_CONFLICT is an error in |
* here, but they need to. T_CONFLICT is an error in |
327 |
* commit_fileproc, whereas T_CONFLICT with conflict markers |
* commit_fileproc, whereas T_MODIFIED with conflict markers |
328 |
* is caught but only warned about. Similarly, update_fileproc |
* is caught but only warned about. Similarly, update_fileproc |
329 |
* currently reregisters a file that was conflicted but lost |
* currently reregisters a file that was conflicted but lost |
330 |
* its markers. |
* its markers. |