summary refs log tree commit diff
path: root/Src/zsh.h
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2014-06-09 09:50:37 +0100
committerPeter Stephenson <pws@zsh.org>2014-06-09 09:50:37 +0100
commit6336347c9e02ebae565b2d62987d1052bcba5567 (patch)
treec57790ed50fa12ab04733286bd10990d59fb13d0 /Src/zsh.h
parent2ba4aa275e548ae9d4406e3bc8008bdfa1ce29eb (diff)
parent4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (diff)
downloadzsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.gz
zsh-6336347c9e02ebae565b2d62987d1052bcba5567.tar.xz
zsh-6336347c9e02ebae565b2d62987d1052bcba5567.zip
fix my own merge conflict with grammar changes
Diffstat (limited to 'Src/zsh.h')
-rw-r--r--Src/zsh.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Src/zsh.h b/Src/zsh.h
index 620883b81..05d582cda 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -2115,6 +2115,7 @@ enum {
     IGNORECLOSEBRACES,
     IGNOREEOF,
     INCAPPENDHISTORY,
+    INCAPPENDHISTORYTIME,
     INTERACTIVE,
     INTERACTIVECOMMENTS,
     KSHARRAYS,