mergetools / gvimdiff2on commit xdiff: use git-compat-util (b46054b)
   1. "$MERGE_TOOLS_DIR/vimdiff"