Merge branch 'fr/vimdiff-layout-fix'

Recent update to vimdiff layout code has been made more robust against different end-user vim settings. * fr/vimdiff-layout-fix: vimdiff: make layout engine more robust against user vim settings