mergetools / gvimdiffon commit Merge branch 'sb/submodule-update-initial-runs-custom-script' (980ee77)
   1. "$MERGE_TOOLS_DIR/vimdiff"