mergetools / gvimdiff2on commit Merge branch 'ao/submodule-wo-gitmodules-checked-out' (abb4824)
   1. "$MERGE_TOOLS_DIR/vimdiff"