mergetools / gvimdiff2on commit Merge branch 'cf/submodule-progress-dissociate' (2a98a87)
   1. "$MERGE_TOOLS_DIR/vimdiff"