Merge branch 'jc/mergetool-tool-help' into maint

diff --git a/diffcore.h b/diffcore.h
index 8f32b824cdc1bac1f094d743f3bee9f32890edca..be0739c5c401c059a0d3030acbc99a7744f17065 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -43,6 +43,7 @@ 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 */