Merge branch 'jk/checkout-from-tree' into maint

diff --git a/lockfile.h b/lockfile.h
index dc066d1783327844f256892f75ab097d7ea8493d..cd2ec95d3003be5ff28f84e9e5b33cc85d9990c3 100644 (file)
--- a/lockfile.h
+++ b/lockfile.h
@@ -71,7 +71,6 @@ struct lock_file {
 #define LOCK_DIE_ON_ERROR 1
 #define LOCK_NO_DEREF 2
 
-extern int unable_to_lock_error(const char *path, int err);
 extern void unable_to_lock_message(const char *path, int err,
                                   struct strbuf *buf);
 extern NORETURN void unable_to_lock_die(const char *path, int err);