builtin-merge: give a proper error message for invalid strategies in config
authorMiklos Vajna <vmiklos@frugalware.org>
Mon, 21 Jul 2008 16:10:47 +0000 (18:10 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2008 05:29:46 +0000 (22:29 -0700)
commit1719b5e...46f54e4196903ae6ed5f8867a5755bf6
tree933449e...7ff043fc7e01d9dca0348eaf6a21e56ccopy hash to clipboard (tree)
parentac2e28c...a43ced3837fbbcf66fd693244b6c6693copy hash to clipboard (diff)
builtin-merge.c
t/t7601-merge-pull-config.sh