contrib/completion: add smerge to the mergetool completion candidates

diff --git a/mailinfo.h b/mailinfo.h
index 766c03dd1d29d00beb75b7553fc6717e24978384..6830e1e6259bb050cf2af9c2e203c8aa52037da1 100644 (file)
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -22,6 +22,8 @@ struct mailinfo {
        struct strbuf *content[MAX_BOUNDARIES];
        struct strbuf **content_top;
        struct strbuf charset;
+       unsigned int format_flowed:1;
+       unsigned int delsp:1;
        char *message_id;
        enum  {
                TE_DONTCARE, TE_QP, TE_BASE64