Merge branch 'fr/vimdiff-layout-fixes'

Layout configuration in vimdiff backend didn't work as advertised, which has been corrected. * fr/vimdiff-layout-fixes: mergetools: vimdiff: add tests for layout with REMOTE as the target mergetools: vimdiff: fix layout where REMOTE is the target