mergetools / gvimdiffon commit Merge branch 'sb/submodule-update-reset-fix' (f060583)
   1. "$MERGE_TOOLS_DIR/vimdiff"