mergetools / gvimdiff2on commit config.c: handle lock file in error case in git_config_rename_... (c06fa62)
   1. "$MERGE_TOOLS_DIR/vimdiff"