mergetools / vimdiff2on commit rebase -i: don't error out if $state_dir already exists (1224f3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"