git-read-tree: fix up three-way merge tests

diff --git a/commit.h b/commit.h
index 8147551c9edc112d2a046e4fc80c65bcb259ba73..85736a89f9a26451973673d26a21f7179b0276b9 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -32,7 +32,15 @@ void free_commit_list(struct commit_list *list);
 
 void sort_by_date(struct commit_list **list);
 
-extern unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf, unsigned long space);
+/* Commit formats */
+enum cmit_fmt {
+       CMIT_FMT_RAW,
+       CMIT_FMT_MEDIUM,
+       CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
+       CMIT_FMT_SHORT
+};
+
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space);
 
 
 /** Removes the first commit from a list sorted by date, and adds all