mergetools / gvimdiffon commit graph: respect the diffopt.file setting (c61008f)
   1. "$MERGE_TOOLS_DIR/vimdiff"