Merge branch 'jl/submodule-conflicted-gitmodules'

diff --git a/dir.h b/dir.h
index aa511da77b0ec54cbdbd3786faad0c1285df7182..433b5b4cd4c51e9b7557d3056570ed46b7ceba92 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -85,8 +85,8 @@ extern void add_exclude(const char *string, const char *base,
 extern void free_excludes(struct exclude_list *el);
 extern int file_exists(const char *);
 
-extern char *get_relative_cwd(char *buffer, int size, const char *dir);
 extern int is_inside_dir(const char *dir);
+extern int dir_inside_of(const char *subdir, const char *dir);
 
 static inline int is_dot_or_dotdot(const char *name)
 {