samoshkin / vim-mergetool

:cake: Efficient way of using Vim as a Git mergetool
MIT License
287 stars 15 forks source link

Support using as git-mergetool on win32 #16

Open idbrii opened 4 years ago

idbrii commented 4 years ago

Fix buffer already exists error on win32.

Cannot create a buffer called 'remote' if there's already one called 'REMOTE' because win32 is not case-sensitive. When we use as git-mergetool, there's always buffers called BASE, LOCAL, and REMOTE. So append a suffix to disambiguate. These buffers are derived by removing conflicts from the merge file, so I call them _derived.