mergetools / gvimdiff2on commit Merge branch 'jk/doc-diff-options' (6366dd9)
   1. "$MERGE_TOOLS_DIR/vimdiff"