mergetools / gvimdiff2on commit setup: convert setup_git_directory_gently_1 et al. to strbuf (7333ed1)
   1. "$MERGE_TOOLS_DIR/vimdiff"