Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tr/mergetool-valgrind'
[gitweb.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index 5189b16c9e59c20b449435c413c34da9f7bf9baa..75816329d6153c35e0763b35f70cfaf165f2a4b8 100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-31,7
+31,7
@@
struct src_data {
int head_status;
};
-void init_src_data(struct src_data *data)
+
static
void init_src_data(struct src_data *data)
{
data->branch.strdup_strings = 1;
data->tag.strdup_strings = 1;