From ed437dbd3483baa3d15d1d86d8f057d9112653b1 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 14 Aug 2019 14:36:44 +0300
Subject: Add support for default options files

---
 bpkg/buildfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bpkg/buildfile')

diff --git a/bpkg/buildfile b/bpkg/buildfile
index adb6d3b..be4a754 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -156,8 +156,8 @@ if $cli.configured
 --guard-prefix BPKG --cxx-prologue "#include <bpkg/types-parsers.hxx>" \
 --cli-namespace bpkg::cli --generate-vector-scanner --generate-file-scanner \
 --generate-group-scanner --keep-separator --generate-specifier \
---generate-parse --page-usage 'bpkg::print_$name$_' --ansi-color \
---include-base-last --option-length 24
+--generate-parse --generate-merge --page-usage 'bpkg::print_$name$_' \
+--ansi-color --include-base-last --option-length 24
 
   cli.cxx{common-options}: cli.options += --short-usage --long-usage # Both.
   cli.cxx{bpkg-options}: cli.options += --short-usage --suppress-undocumented
-- 
cgit v1.1