From 288bd81d8f2d8ad71a73487fc11684020e95ad9e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 4 Sep 2015 07:58:36 -0400
Subject: [PATCH] CmdShow: Added 'rule.color.merge' as a valid configuration
 setting

---
 src/commands/CmdShow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index d38b584bd..d34648d26 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -183,6 +183,7 @@ int CmdShow::execute (std::string& output)
     " regex"
     " reserved.lines"
     " row.padding"
+    " rule.color.merge"
     " rule.precedence.color"
     " search.case.sensitive"
     " shell.prompt"