mergetools / gvimdiffon commit Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax (ff65e79)
   1. "$MERGE_TOOLS_DIR/vimdiff"