Lines Matching full:conflict
2455 /// \brief Find the end of a version control conflict marker.
2476 /// control conflict marker like '<<<<<<<', recognize it as such, emit an error
2477 /// and recover nicely. This returns true if it is a conflict marker and false
2480 // Only a conflict marker if it starts at the beginning of a line.
2490 // If we have a situation where we don't care about conflict markers, ignore
2498 // start of a line to terminate this conflict marker.
2500 // We found a match. We are really in a conflict marker.
2506 // end-of-conflict marker starts with \r or \n.
2515 // No end of conflict marker found.
2521 /// it is '<<<<' and the conflict marker started with a '>>>>' marker, then it
2522 /// is the end of a conflict marker. Handle it by ignoring up until the end of
2523 /// the line. This returns true if it is a conflict marker and false if not.
2525 // Only a conflict marker if it starts at the beginning of a line.
2530 // If we have a situation where we don't care about conflict markers, ignore
2540 // If we do have it, search for the end of the conflict marker. This could
2542 // be the end of conflict marker.
2553 // No longer in the conflict marker.
3223 // If this is actually a '<<<<<<<' version control conflict marker,
3227 // If this is '<<<<' and we're in a Perforce-style conflict marker,
3280 // If this is actually a '>>>>' conflict marker, recognize it as such
3284 // If this is '>>>>>>>' and we're in a conflict marker, ignore it.
3314 // If this is '|||||||' and we're in a conflict marker, ignore it.
3341 // If this is '====' and we're in a conflict marker, ignore it.
