If you merge the test branch into the master branch, it will leave you with a merge conflict and you’ll see the merge item under source control.
I tried with the File->Merge option and it still crashes on version 4.7.2
If you need, I can upload another test project with the files already in a conflicted state.
Thanks,