builtin/merge.c: drop a parameter that is never used

diff --git a/pretty.c b/pretty.c
index 962e82be8633217b811a8c8c87b892721b35f662..296cb5680ac6ba7a7c7670652e9287f56a1c1338 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -274,7 +274,7 @@ static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
 
 enum rfc2047_type {
        RFC2047_SUBJECT,
-       RFC2047_ADDRESS,
+       RFC2047_ADDRESS
 };
 
 static int is_rfc2047_special(char ch, enum rfc2047_type type)