@sussudio/platform
Version:
Internal APIs for VS Code's service injection the base services.
16 lines (14 loc) • 612 B
text/typescript
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
export interface IMergeResult {
localContent: string | null;
remoteContent: string | null;
hasConflicts: boolean;
}
export declare function merge(
originalLocalContent: string,
originalRemoteContent: string,
baseContent: string | null,
): IMergeResult;