Move make_cache_entry() from merge-recursive.c into read-cache.c

diff --git a/rsh.h b/rsh.h
index 3b4194239dc419c38910012b129c4c92b72ef8ad..ee2f49929131c684bcffa3e95a1ee29521e8818b 100644 (file)
--- a/rsh.h
+++ b/rsh.h
@@ -1,7 +1,7 @@
 #ifndef RSH_H
 #define RSH_H
 
-int setup_connection(int *fd_in, int *fd_out, const char *remote_prog, 
+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
                     char *url, int rmt_argc, char **rmt_argv);
 
 #endif