mergetools / vimdiff2on commit test-lib: set $TRASH_DIRECTORY earlier (61f292d)
   1. "$MERGE_TOOLS_DIR/vimdiff"