mergetools / gvimdiff2on commit Merge branch 'ah/submodule-typofix-in-error' (2953140)
   1. "$MERGE_TOOLS_DIR/vimdiff"