mergetools / gvimdiff3on commit checkout: don't require a work tree when checking out into a new one (3473ad0)
   1. "$MERGE_TOOLS_DIR/vimdiff"