mergetools / vimdiff2on commit Merge branch 'jk/revision-o-is-in-libgit-a' (69b024d)
   1. "$MERGE_TOOLS_DIR/vimdiff"