summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-06 00:35:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-06 00:35:13 -0700
commit44701c67fd1d5d771b440c8646b7b268d4f1402d (patch)
treeaa64a8e791d43ce75333e822fd751963c9cab868 /builtin-merge-file.c
parenthg-to-git: use git init instead of git init-db (diff)
parentFix "config_error_nonbool" used with value instead of key (diff)
downloadtgif-44701c67fd1d5d771b440c8646b7b268d4f1402d.tar.xz
Merge branch 'qq/maint'
* qq/maint: Fix "config_error_nonbool" used with value instead of key
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions