aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-05-21 12:07:47 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-21 03:59:12 -0700
commitb3d83d9f2ef1b0f0f53bb7254e234c743aa42817 (patch)
tree2d8cd2440e227b8a83ef37d8826f379f3507568b /ll-merge.c
parent572e4f6a0c14f650d4cd71876e4249be4c3ad019 (diff)
downloadgit-b3d83d9f2ef1b0f0f53bb7254e234c743aa42817.tar.gz
git-b3d83d9f2ef1b0f0f53bb7254e234c743aa42817.tar.xz
Complete prototype of git_config_from_parameters()
Add the missing argument list. (Its lack triggered a compiler warning for me.) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions