mergetools / gvimdiff2on commit builtin/merge.c: drop a parameter that is never used (08e3ce5)
   1. "$MERGE_TOOLS_DIR/vimdiff"