diff options
| author | Matthias Kestenholz <matthias@spinlock.ch> | 2006-08-02 23:52:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-02 17:05:21 -0700 |
| commit | 25f38f064f7f9ccde337eafcf575e4a5a1079346 (patch) | |
| tree | 94c5aff7d29e55e80dc23787945a75ab1f0d3e1e /builtin-fmt-merge-msg.c | |
| parent | e12c095aa69d8aca0326eb11960427d9bf9e2db7 (diff) | |
| download | git-25f38f064f7f9ccde337eafcf575e4a5a1079346.tar.gz git-25f38f064f7f9ccde337eafcf575e4a5a1079346.tar.xz | |
use declarations from builtin.h for builtin commands
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index c84224ee8..485ede7ca 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "commit.h" #include "diff.h" @@ -242,7 +243,7 @@ static void shortlog(const char *name, unsigned char *sha1, free_list(&subjects); } -int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix) +int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) { int limit = 20, i = 0; char line[1024]; |