Merge branch 'maint'

* maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings
2010-06-25 11:45:27 -07:00
parent ba4d01bd74 9eafa1201b
commit f526d120f6
5 changed files with 10 additions and 10 deletions
--- 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;