From b67c7e1a1fab761159e45505579e9ab6d8ec78d8 Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Mon, 5 May 2014 21:57:23 -0400
Subject: renamed merge KEYSPEC to SPEC for consistency with other commands.

---
 kiki.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiki.hs b/kiki.hs
index a7189f0..6c72eb5 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -877,7 +877,7 @@ kiki "merge" [] = do
         [ "kiki merge ( --home[=HOMEDIR]"
         , "           | --type=(keyring|pem|wallet|hosts)"
         , "           | --access=[auto|secret|public]"
-        , "           | --flow=(fill|spill|sync)[,(subkeys|match=KEYSPEC)]"
+        , "           | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]"
         , "           | --create=CMD"
         , "           | --autosign[=no]"
         , "           | --"
-- 
cgit v1.2.3