mergetools / vimdiff2on commit Merge branch 'jk/diff-submodule-diff-inline' (d347fb6)
   1. "$MERGE_TOOLS_DIR/vimdiff"