Document 'opendiff' value in config.txt and git-mergetool.txt

diff --git a/lockfile.c b/lockfile.c
index 731bbf3c9c312687714d19391e6e02ffde8eaebd..4824f4dc026e7b3f978fe4e9b2154335359e9d2e 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -49,7 +49,7 @@ int hold_lock_file_for_update(struct lock_file *lk, const char *path, int die_on
 {
        int fd = lock_file(lk, path);
        if (fd < 0 && die_on_error)
-               die("unable to create '%s': %s", path, strerror(errno));
+               die("unable to create '%s.lock': %s", path, strerror(errno));
        return fd;
 }