mergetools / gvimdiff2on commit setup: teach discover_git_directory to respect the commondir (d3fb71b)
   1. "$MERGE_TOOLS_DIR/vimdiff"