summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Sverre Rabbelier <srabbelier@gmail.com>2011-05-05 20:56:00 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-05 21:21:24 -0700
commit4cce4ef2d5b2a3be1ddb17e9aa12b3307900b41d (patch)
treea4313c6f91918e995ea3a5283b0a34d1da9d80c8 /builtin/merge-recursive.c
parentgit-fast-import.txt: --relative-marks takes no parameter (diff)
downloadtgif-4cce4ef2d5b2a3be1ddb17e9aa12b3307900b41d.tar.xz
fast-import: fix option parser for no-arg options
While refactoring the options parser in bc3c79a (fast-import: add (non-)relative-marks feature, 2009-12-04), it was made too lenient for options that take no argument, fix that. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions