[WIP] fix conflict detection#4446

datho7561 wants to merge 1 commit into

redhat-developer:mainredhat-developer/vscode-java:mainfrom

datho7561:fix-merge-commit-detectiondatho7561/vscode-java:fix-merge-commit-detectionCopy head branch name to clipboard