summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/fmt-merge-msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 1350462d43..f6d92e263c 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -37,7 +37,7 @@ struct src_data {
struct origin_data {
unsigned char sha1[20];
- int is_local_branch:1;
+ unsigned is_local_branch:1;
};
static void init_src_data(struct src_data *data)