diff options
| author |  Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2011-10-09 18:33:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-09 13:20:54 -0700 |
| commit | 273c7032e9e79613349e24db3b0e40e8b5c0c62c (patch) | |
| tree | d09ed1df45bac3aedf436e65795ca4f0a98b808b /builtin | |
| parent | builtin/log.c: Fix an "Using plain integer as NULL pointer" warning (diff) | |
| download | tgif-273c7032e9e79613349e24db3b0e40e8b5c0c62c.tar.xz | |
environment.c: Fix an sparse "symbol not declared" warning
In particular, sparse issues the following warning:
environment.c:62:5: warning: symbol 'merge_log_config' was not \
declared. Should it be static?
In order to supress the warning, we include the "fmt-merge-msg.h"
header file, since it contains an appropriate extern declaration for
the 'merge_log_config' variable.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions