/* generated using openapi-typescript-codegen -- do not edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
import type { MergeConflictSection } from './MergeConflictSection';
import type { Oid } from './Oid';
export type MergeConflict = {
	base_oid?: (null | Oid);
	binary: boolean;
	mode: number;
	ours_oid?: (null | Oid);
	path: string;
	sections: Array<MergeConflictSection>;
	theirs_oid?: (null | Oid);
};

