summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_bzr2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 20fa306e7..84e45bb23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-18 Peter Stephenson <pws@csr.com>
+
+ * Matthieu Baerts: 29547: Completion/Unix/Command/_bzr: cdiff
+ subcommand.
+
2011-07-12 Peter Stephenson <pws@csr.com>
* 29543: Src/hist.c: saved history lines with backslash-newline
@@ -15106,5 +15111,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5395 $
+* $Revision: 1.5396 $
*****************************************************
diff --git a/Completion/Unix/Command/_bzr b/Completion/Unix/Command/_bzr
index 47083ca49..83f6fd19b 100644
--- a/Completion/Unix/Command/_bzr
+++ b/Completion/Unix/Command/_bzr
@@ -259,7 +259,7 @@ case $cmd in
)
;;
-(diff|dif|di)
+(diff|dif|di|cdiff)
args+=(
'(-r --revision)'{--revision=,-r}'[revision]:revision:'
'--diff-options=[options to pass to gdiff]:diff options:'