REMOTE and LOCAL buffers fail to load

[idbrii]

Trying to merge loader.lua and show L or R in a diff and I get errors in those buffers.

:edit loader.lua
:MergetoolStart
:MergetoolToggleLayout LmR

LOCAL:

fatal: Not a valid object name :2:loader.lua

REMOTE:

fatal: Not a valid object name :3:loader.lua

Looks like the issue is that mergetool is assuming merging is started at the root of the repository, but when starting mergetool while editing, it is not.

Probably s:mergedfile_name needs to be relative to the .git.

Tested on 0275a85

[idbrii]

There was one other issue: git requires forward slashes -- even on Windows.

Here are the steps required to get it to work:

:edit loader.lua
" note: cwd is the folder containing loader.lua
:cd ../../..
" go up to repo root
:set shellslash
:MergetoolStart
:MergetoolToggleLayout LmR

[idbrii]

I fixed this in my fork by using fugitive to load the other files: idbrii@2a8c1c5