mergetools / gvimdiffon commit t/helper: merge test-parse-options into test-tool (2f17c78)
   1. "$MERGE_TOOLS_DIR/vimdiff"