Merge branch 'maint-1.7.3' into maint

[thirdparty/git.git] / tree-walk.h

diff --git a/tree-walk.h b/tree-walk.h
index f78361a676be002a36bed0f243217c4e0ae9c8d1..7e3e0b5ad16710c06464726ac04d2b1c48af3708 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -48,6 +48,7 @@ struct traverse_info {
        unsigned long conflicts;
        traverse_callback_t fn;
        void *data;
+       int show_all_errors;
 };
 
 int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);