modify/delete conflict resolution overwrites untracked file

[git.git] / log-tree.h

diff --git a/log-tree.h b/log-tree.h
index 0cc9344eabdd0046edf360958376b2037ef643dc..59ba4c48b7966db34c6345a445ab0b10e235ac83 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -11,9 +11,11 @@ void init_log_tree_opt(struct rev_info *);
 int log_tree_diff_flush(struct rev_info *);
 int log_tree_commit(struct rev_info *, struct commit *);
 int log_tree_opt_parse(struct rev_info *, const char **, int);
-void show_log(struct rev_info *opt, const char *sep);
+void show_log(struct rev_info *opt);
 void show_decorations(struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, const char *name,
-                            const char **subject_p, const char **extra_headers_p);
+                            const char **subject_p,
+                            const char **extra_headers_p,
+                            int *need_8bit_cte_p);
 
 #endif