'use strict';

var conflict = /^<<<<<<<(?: .*)?\n(?:(?:.|\n)*?\n)?=======\n(?:(?:.|\n)*?\n)?>>>>>>>(?: .*)?$/;
conflict.resolution = /^<<<<<<<(?: .*)?\n(?!=======\n)(?:(?:.|\n(?!=======\n))*?\n)?>>>>>>>(?: .*)?$/;
conflict.start = /^<<<<<<<(?: .*)?$/;
conflict.end = /^>>>>>>>(?: .*)?$/;

module.exports = conflict;

@@ -59,16 +59,17 @@
 n)*?%5Cn)?
+?
 =======%5C
@@ -82,24 +82,25 @@
 :.%7C%5Cn)*?%5Cn)?
+?
 %3E%3E%3E%3E%3E%3E%3E(?: .

use non-greedy optional matching (`??`)