mergetools / gvimdiffon commit diff-parseopt: restore -U (no argument) behavior (8ef0519)
   1. "$MERGE_TOOLS_DIR/vimdiff"