mergetools / gvimdiff2on commit discover_git_directory(): avoid setting invalid git_dir (69743f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"