# 
# patch "ChangeLog"
#  from [fc146fccb9a3a2d7ec42c1cc982075b470e4e25c]
#    to [70be6b18ce1f5a088e894dbbc3ea97cb1184d5eb]
# 
# patch "commands.cc"
#  from [e91738f6920ce61beca85f8703a8efbab058a53e]
#    to [0a5d9cd019e6de8366160979548bd62167777ee2]
# 
========================================================================
--- ChangeLog	fc146fccb9a3a2d7ec42c1cc982075b470e4e25c
+++ ChangeLog	70be6b18ce1f5a088e894dbbc3ea97cb1184d5eb
@@ -1,3 +1,7 @@
+2005-11-27  Nathaniel Smith  <address@hidden>
+
+	* commands.cc (diff): Remove OPT_BRANCH from diff's options.
+
 2005-11-27  Julio M. Merino Vidal  <address@hidden>
 
 	* configure.ac: Do not use test's == operator because it is not
========================================================================
--- commands.cc	e91738f6920ce61beca85f8703a8efbab058a53e
+++ commands.cc	0a5d9cd019e6de8366160979548bd62167777ee2
@@ -2672,7 +2672,7 @@
     "If one revision is given, the diff between the working directory and\n"
     "that revision is shown.  If two revisions are given, the diff between\n"
     "them is given.  If no format is specified, unified is used by default."),
-    OPT_BRANCH_NAME % OPT_REVISION % OPT_DEPTH %
+    OPT_REVISION % OPT_DEPTH %
     OPT_UNIFIED_DIFF % OPT_CONTEXT_DIFF % OPT_EXTERNAL_DIFF %
     OPT_EXTERNAL_DIFF_ARGS)
 {