mergetools / gvimdiff3on commit move connect_work_tree_and_git_dir to dir.h (47e83eb)
   1. "$MERGE_TOOLS_DIR/vimdiff"