mergetools / vimdiff2on commit rollback_lock_file(): do not clear filename redundantly (5527d53)
   1. "$MERGE_TOOLS_DIR/vimdiff"