mergetools / gvimdiff3on commit Merge branch 'sb/submodule-config-cleanup' (95d0367)
   1. "$MERGE_TOOLS_DIR/vimdiff"