mergetools / vimdiff2on commit Merge branch 'jk/cached-commit-buffer' (e33c332)
   1. "$MERGE_TOOLS_DIR/vimdiff"