mergetools / gvimdiff3on commit Merge branch 'jc/merge-bases' (0985015)
   1. "$MERGE_TOOLS_DIR/vimdiff"