diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-25 22:45:27 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-25 22:45:27 +0400 |
| commit | f526d120f649ec4426b559e94e09655b5a4f2b87 (patch) | |
| tree | d1be8cbf55a8f0913b4347bece6ea5ecbcb580b0 /builtin | |
| parent | ba4d01bd74edae1e4adb540a03ba17961f8dd4b2 (diff) | |
| parent | 9eafa1201b2dcc703258ca7cd53de8ac4de74565 (diff) | |
Merge branch 'maint'
* maint:
msvc: Fix some compiler warnings
Documentation: grep: fix asciidoc problem with --
msvc: Fix some "expr evaluates to function" compiler warnings
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 648033c27e..f1f53a80e1 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -313,7 +313,7 @@ int commit_notes(struct notes_tree *t, const char *msg) return 0; } -combine_notes_fn *parse_combine_notes_fn(const char *v) +combine_notes_fn parse_combine_notes_fn(const char *v) { if (!strcasecmp(v, "overwrite")) return combine_notes_overwrite; |