'use strict';

var conflict = require('./conflict');


exports.extract = function (result, cb) {
  var lines = result.trim().split('\n');
  if (lines.length < 2 ||
      !conflict.start.test(lines[0]) ||
      !conflict.end.test(lines[lines.length - 1])) {
    return cb(Error('Could not parse resolution result. Header and footer lines not found.'));
  }
  cb(null, lines.slice(1, -1).join('\n'));
};

@@ -277,63 +277,21 @@
 ('Co
-uld not parse resolution result. Header and footer line
+nflict marker
 s no

change the error message