mergetools / gvimdiff3on commit Merge branch 'ks/typofix-commit-c-comment' (cd0391a)
   1. "$MERGE_TOOLS_DIR/vimdiff"