checkout --conflict=diff3: add a label for ancestor

diff --git a/cache.h b/cache.h
index 89f6a40d1a1011bca4d546c5979d66d44b408ece..f62db0bd7e8f79f5d8a31e61c6164344bad10b65 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -891,6 +891,7 @@ struct ref {
 extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
 
 #define CONNECT_VERBOSE       (1u << 0)
+extern char *git_getpass(const char *prompt);
 extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
 extern int finish_connect(struct child_process *conn);
 extern int path_match(const char *path, int nr, char **match);