mergetools / gvimdiff2on commit Merge branch 'jk/repo-init-cleanup' (b4a1eec)
   1. "$MERGE_TOOLS_DIR/vimdiff"