mergetools / gvimdiffon commit Make error message after failing commit_lock_file() less confusing (08a3651)
   1. "$MERGE_TOOLS_DIR/vimdiff"