mergetools / gvimdiffon commit Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6 (717e355)
   1. "$MERGE_TOOLS_DIR/vimdiff"