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