diff options
author | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2014-06-09 09:50:37 +0100 |
commit | 6336347c9e02ebae565b2d62987d1052bcba5567 (patch) | |
tree | c57790ed50fa12ab04733286bd10990d59fb13d0 /Src/options.c | |
parent | 2ba4aa275e548ae9d4406e3bc8008bdfa1ce29eb (diff) | |
parent | 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (diff) | |
download | zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.gz zsh-6336347c9e02ebae565b2d62987d1052bcba5567.zip |
fix my own merge conflict with grammar changes
Diffstat (limited to 'Src/options.c')
-rw-r--r-- | Src/options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Src/options.c b/Src/options.c index e83dc5839..2163bff4d 100644 --- a/Src/options.c +++ b/Src/options.c @@ -165,6 +165,7 @@ static struct optname optns[] = { {{NULL, "ignoreclosebraces", OPT_EMULATE}, IGNORECLOSEBRACES}, {{NULL, "ignoreeof", 0}, IGNOREEOF}, {{NULL, "incappendhistory", 0}, INCAPPENDHISTORY}, +{{NULL, "incappendhistorytime", 0}, INCAPPENDHISTORYTIME}, {{NULL, "interactive", OPT_SPECIAL}, INTERACTIVE}, {{NULL, "interactivecomments",OPT_BOURNE}, INTERACTIVECOMMENTS}, {{NULL, "ksharrays", OPT_EMULATE|OPT_BOURNE}, KSHARRAYS}, |