mergetools / gvimdiff2on commit Merge branch 'bw/submodule-config-cleanup' into next (e35d58c)
   1. "$MERGE_TOOLS_DIR/vimdiff"