Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #84274

Browse Source
This commit is contained in:
Joao Moreno
2019-11-08 15:55:30 +01:00
parent 655bd8f303
commit fd091abb85
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/git/src/git.ts
View File

@@ -1823,7 +1823,6 @@ export class Repository {
return message.replace(/^\s*#.*$\n?/gm, '').trim();
}
async getMergeMessage(): Promise<string | undefined> {
const mergeMsgPath = path.join(this.repositoryRoot, '.git', 'MERGE_MSG');