[PATCH] Remove final newline from the value of xfrm_msg variable.

diff --git a/diff.h b/diff.h
index cae6e14fc519be35210b1772feb8c881d333ceb1..0d1f9ae347fdaf9970a80ccc47114b474dafa35d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -15,12 +15,14 @@ extern void diff_change(unsigned mode1, unsigned mode2,
                             const unsigned char *sha2,
                             const char *base, const char *path);
 
-extern void diff_guif(unsigned mode1,
-                     unsigned mode2,
-                     const unsigned char *sha1,
-                     const unsigned char *sha2,
-                     const char *path1,
-                     const char *path2);
+extern void diff_helper_input(unsigned mode1,
+                             unsigned mode2,
+                             const unsigned char *sha1,
+                             const unsigned char *sha2,
+                             const char *path1,
+                             int status,
+                             int score,
+                             const char *path2);
 
 extern void diff_unmerge(const char *path);
 
@@ -37,13 +39,11 @@ extern void diff_setup(int reverse);
 
 extern void diffcore_rename(int rename_copy, int minimum_score);
 
-extern void diffcore_prune(void);
-
 extern void diffcore_pickaxe(const char *needle);
 extern void diffcore_pathspec(const char **pathspec);
 
 extern int diff_queue_is_empty(void);
 
-extern void diff_flush(int output_style);
+extern void diff_flush(int output_style, int resolve_rename_copy);
 
 #endif /* DIFF_H */