rebase: remove obsolete and unused LONG_USAGE which breaks xgettext

diff --git a/diffcore.h b/diffcore.h
index b8f1fdecf4d9e5e8f8e834eb55a374f1af8352fd..be0739c5c401c059a0d3030acbc99a7744f17065 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -43,9 +43,10 @@ struct diff_filespec {
        unsigned should_free : 1; /* data should be free()'ed */
        unsigned should_munmap : 1; /* data should be munmap()'ed */
        unsigned dirty_submodule : 2;  /* For submodules: its work tree is dirty */
+       unsigned is_stdin : 1;
 #define DIRTY_SUBMODULE_UNTRACKED 1
 #define DIRTY_SUBMODULE_MODIFIED  2
-
+       unsigned has_more_entries : 1; /* only appear in combined diff */
        struct userdiff_driver *driver;
        /* data should be considered "binary"; -1 means "don't know yet" */
        int is_binary;