diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts index 747a2ada11b..c36362c2823 100644 --- a/extensions/git/src/api/api1.ts +++ b/extensions/git/src/api/api1.ts @@ -256,6 +256,14 @@ export class ApiRepository implements Repository { commit(message: string, opts?: CommitOptions): Promise { return this.repository.commit(message, opts); } + + merge(ref: string): Promise { + return this.repository.merge(ref); + } + + mergeAbort(): Promise { + return this.repository.mergeAbort(); + } } export class ApiGit implements Git { diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index 9ac4fdd0161..0b155423619 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -257,6 +257,8 @@ export interface Repository { log(options?: LogOptions): Promise; commit(message: string, opts?: CommitOptions): Promise; + merge(ref: string): Promise; + mergeAbort(): Promise; } export interface RemoteSource {