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