environment.c: Fix an sparse "symbol not declared" warning
commit273c7032e9e79613349e24db3b0e40e8b5c0c62c
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>
Sun, 9 Oct 2011 17:33:34 +0000 (9 18:33 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Oct 2011 20:20:54 +0000 (9 13:20 -0700)
treed09ed1df45bac3aedf436e65795ca4f0a98b808b
parent22a8699a6b1587024b884a80d88631db6a0ef511
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>
environment.c