mergetools / gvimdiffon commit rev-parse: remove restrictions on some options (68889b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"