mergetool--lib: add support for araxis merge

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index ad123d78c582e11e27748a613fae5b17bd87b0e9..be39e7d38643817cced4e07a89b6db5201f2b747 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -50,7 +50,6 @@ struct rev_info {
                        edge_hint:1,
                        limited:1,
                        unpacked:1,
-                       kept_pack_only:1,
                        boundary:2,
                        left_right:1,
                        rewrite_parents:1,
@@ -86,6 +85,8 @@ struct rev_info {
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;
+       const char      *patch_suffix;
+       int             numbered_files;
        char            *message_id;
        struct string_list *ref_message_ids;
        const char      *add_signoff;
@@ -145,6 +146,8 @@ struct name_path {
        const char *elem;
 };
 
+char *path_name(const struct name_path *path, const char *name);
+
 extern void add_object(struct object *obj,
                       struct object_array *p,
                       struct name_path *path,