public static bool HandleConflictsSaveSide(string fileName, string saveAs, string side)
{
side = GetSide(side);
fileName = FixPath(fileName);
var unmerged = RunCmd(Settings.GitCommand, "ls-files -z --unmerged \"" + fileName + "\"").Split(new char[] { '\0', '\n' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var file in unmerged)
{
var fileline = file.Split(new[] { ' ', '\t' });
if (fileline.Length < 3)
continue;
if (fileline[2].Trim() != side)
continue;
File.WriteAllText(saveAs, RunCmd(Settings.GitCommand, "cat-file blob \"" + fileline[1] + "\""));
return true;
}
return false;
}