merge-recursive: remove duplicate code

diff --git a/cache.h b/cache.h
index b829410f6da0afc14353b4621d2fdf874181a9f7..9f09540bbca587cb2ba0135a69d65aa966b09622 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1771,7 +1771,7 @@ int split_cmdline(char *cmdline, const char ***argv);
 /* Takes a negative value returned by split_cmdline */
 const char *split_cmdline_strerror(int cmdline_errno);
 
-/* git.c */
+/* setup.c */
 struct startup_info {
        int have_repository;
        const char *prefix;