diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:52:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:52:46 -0700 |
commit | 64d845477b555a06ce469860861691d003335e9c (patch) | |
tree | 5b11e3b1e24ec047311d18abf2c4d31d7e01f7f7 /pretty.c | |
parent | 7fe683480124239ec0ab555c9b529e4c54707d7b (diff) | |
parent | c2f7b1026e33e308782fcb1b60e3d7af107fdc18 (diff) | |
download | git-64d845477b555a06ce469860861691d003335e9c.tar.gz |
Merge branch 'maint'
* maint:
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |