git-svnimport: Improved detection of merges.

diff --git a/builtin.h b/builtin.h
index 714b97578cb62db7be247c4e799fcd9a946cc76c..738ec3d9453886b1b011b5e01e9ac71b25d8f06f 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -42,5 +42,6 @@ extern int cmd_diff_files(int argc, const char **argv, char **envp);
 extern int cmd_diff_index(int argc, const char **argv, char **envp);
 extern int cmd_diff_stages(int argc, const char **argv, char **envp);
 extern int cmd_diff_tree(int argc, const char **argv, char **envp);
+extern int cmd_cat_file(int argc, const char **argv, char **envp);
 
 #endif