t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test

diff --git a/submodule.h b/submodule.h
index 0773121eb525071b45d9faec0fbf38254488c045..dbda270873171c41f20c0f07b70773ce67c6a303 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -3,7 +3,8 @@
 
 void show_submodule_summary(FILE *f, const char *path,
                unsigned char one[20], unsigned char two[20],
+               unsigned dirty_submodule,
                const char *del, const char *add, const char *reset);
-int is_submodule_modified(const char *path);
+unsigned is_submodule_modified(const char *path, int ignore_untracked);
 
 #endif