Open sascha-wolf opened 10 years ago
Probably related to the regular expression.
Example:
<<<<<<< .mine ours ... ======= theirs ... >>>>>>> .r33477
Probably related to the regular expression.