Skip to content

Support using as git-mergetool on win32 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
idbrii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support using as git-mergetool on win32 #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion autoload/mergetool.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,13 @@ function! s:load_revision(revision)
call s:remove_conflict_markers(a:revision)
setlocal nomodifiable readonly buftype=nofile bufhidden=delete nobuflisted
execute "setlocal filetype=" . s:mergedfile_filetype
execute "file " . a:revision
let bufname = a:revision
if s:run_as_git_mergetool && has('win32')
" Cannot create a buffer called 'remote' if there's already one called
" 'REMOTE' because win32 is not case-sensitive.
let bufname .= '_derived'
endif
execute "file " . bufname
elseif a:revision ==# 'BASE' || a:revision ==# 'REMOTE' || a:revision ==# 'LOCAL'

" First, if run as 'git mergetool', try find buffer by name: 'BASE|REMOTE|LOCAL'
Expand Down