mergetools / gvimdiffon commit commit_lock_file(): rollback lock file on failure to rename (1b1648f)
   1. "$MERGE_TOOLS_DIR/vimdiff"