diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:15 -0700 |
commit | 643318913fc791790eb30a78531f7ae4eed7155d (patch) | |
tree | 6c0f1986b04caa06f04c66ae33b348be27b90ac7 | |
parent | Merge branch 'sg/test-lib-simplify-expr-away' (diff) | |
parent | remote.c: spell __attribute__ correctly (diff) | |
download | tgif-643318913fc791790eb30a78531f7ae4eed7155d.tar.xz |
Merge branch 'jk/fix-attribute-macro-in-2.5'
Code fixup.
* jk/fix-attribute-macro-in-2.5:
remote.c: spell __attribute__ correctly
-rw-r--r-- | remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1660,7 +1660,7 @@ int branch_merge_matches(struct branch *branch, return refname_match(branch->merge[i]->src, refname); } -__attribute((format (printf,2,3))) +__attribute__((format (printf,2,3))) static const char *error_buf(struct strbuf *err, const char *fmt, ...) { if (err) { |