Lines Matching full:marker
1953 /// FindConflictEnd - Find the end of a version control conflict marker.
1971 /// control conflict marker like '<<<<<<<', recognize it as such, emit an error
1972 /// and recover nicely. This returns true if it is a conflict marker and false
1975 // Only a conflict marker if it starts at the beginning of a line.
1991 // a line to terminate this conflict marker.
1993 // We found a match. We are really in a conflict marker.
1999 // end-of-conflict marker starts with \r or \n.
2008 // No end of conflict marker found.
2014 /// marker, then it is the end of a conflict marker. Handle it by ignoring up
2015 /// until the end of the line. This returns true if it is a conflict marker and
2018 // Only a conflict marker if it starts at the beginning of a line.
2028 // Check to see if we have the marker (7 characters in a row).
2033 // If we do have it, search for the end of the conflict marker. This could
2035 // be the end of conflict marker.
2045 // No longer in the conflict marker.
2447 // If this is actually a '<<<<<<<' version control conflict marker,
2498 // If this is '>>>>>>>' and we're in a conflict marker, ignore it.
2528 // If this is '|||||||' and we're in a conflict marker, ignore it.
2555 // If this is '=======' and we're in a conflict marker, ignore it.
