mergetools / gvimdiffon commit Merge branch 'sb/submodule-recommend-shallowness' (dc7e09a)
   1. "$MERGE_TOOLS_DIR/vimdiff"