diff options
author | 2016-05-18 14:40:12 -0700 | |
---|---|---|
committer | 2016-05-18 14:40:12 -0700 | |
commit | 9ba3b14c64345838310797d5a5cebbf12e2daca3 (patch) | |
tree | 194fcc9c1a007c44fd1b2889932d4c18fbfa237e | |
parent | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD (diff) | |
parent | remote.c: spell __attribute__ correctly (diff) | |
download | tgif-9ba3b14c64345838310797d5a5cebbf12e2daca3.tar.xz |
Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
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) { |