Git - merge editor fails to open

[lszomoru]

Steps to Reproduce:

1. Install the latest VS Code Insiders release
2. Open a folder/workspace that contains a git repository
3. Edit the same file in two branches to generate a conflict
4. Merge one branch into another
5. Click on "Resolve in Merge Editor" button

Expected: merge editor should open
Actual: merge editor fails to open