rsh.hon commit git-read-tree: fix up two-way merge (e6ee623)
   1#ifndef RSH_H
   2#define RSH_H
   3
   4int setup_connection(int *fd_in, int *fd_out, char *remote_prog, 
   5                     char *url, int rmt_argc, char **rmt_argv);
   6
   7#endif