public static bool ResolveConflict(Surface origin, Surface local, Surface remote, Surface result, VcsContext context)
Параметры
Возвращаемое значение