Merge branch 'es/worktree-forced-ops-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"