Problem with git command to open the merge editor when the file is renamed 

1. Create a branch `testBranch` off of `main`
2. In `testBranch` rename a file
3. in `main` modify the same file
4. Fetch `main` if you haven't already
5. Checkout `testBranch`
6. `git merge main`
7. You'll get a merge conflict. From the SCM view, open the merge editor. The "Current" is correct, but the "Incoming" is empty.