mirror of
https://github.com/gosticks/DefinitelyTyped.git
synced 2025-10-16 12:05:41 +00:00
45 lines
692 B
TypeScript
45 lines
692 B
TypeScript
export interface MergeFileOptions {
|
|
/**
|
|
*
|
|
*
|
|
* @type {number}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
version?: number;
|
|
/**
|
|
*
|
|
*
|
|
* @type {string}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
ancestorLabel?: string;
|
|
/**
|
|
*
|
|
*
|
|
* @type {string}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
ourLabel?: string;
|
|
/**
|
|
*
|
|
*
|
|
* @type {string}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
theirLabel?: string;
|
|
/**
|
|
*
|
|
*
|
|
* @type {number}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
favor?: number;
|
|
/**
|
|
*
|
|
*
|
|
* @type {number}
|
|
* @memberof MergeFileOptions
|
|
*/
|
|
flags?: number;
|
|
}
|