ccm.cli.tools.merge.conflict.content

The ccm.cli.tools.merge.conflict.content setting specifies a regular expression that, when matched in the output merge result file, indicates that merge conflicts were detected.
Type:

Default value: [^<<<<<<<]*<<<<<<<[^=======]*=======[^>>>>>>>]*>>>>>>>


Feedback