mergetools / gvimdiff2on commit Merge 'hv/submodule-config' to 'sb/submodule-helper' (5a1ba6b)
   1. "$MERGE_TOOLS_DIR/vimdiff"