Merge lp:~ian-clatworthy/bzr/475451 into lp:bzr

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This fixes a documentation issue raised by MySQL.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/475451 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #475451 MYSQL/BZR P3: please mention in "bzr help diff" that -c gives diff against *left* parent
> https://bugs.launchpad.net/bugs/475451
>
>
> This fixes a documentation issue raised by MySQL.
>

 review: approve
 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksGsbkACgkQJdeBCYSNAAOr5QCfZ8vAqh6/BiFqQtjU+kHFj9Vg
304Ani32Bl8tQnBbaZbwdGOtCWWSQ+JT
=zGsx
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-11-20 05:54:54 +0000
+++ bzrlib/builtins.py	2009-11-20 07:55:27 +0000
@@ -1832,13 +1832,23 @@
 
             bzr diff -r1
 
-        Difference between revision 2 and revision 1::
-
-            bzr diff -r1..2
-
-        Difference between revision 2 and revision 1 for branch xxx::
-
-            bzr diff -r1..2 xxx
+        Difference between revision 3 and revision 1::
+
+            bzr diff -r1..3
+
+        Difference between revision 3 and revision 1 for branch xxx::
+
+            bzr diff -r1..3 xxx
+
+        To see the changes introduced in revision X::
+        
+            bzr diff -cX
+
+        Note that in the case of a merge, the -c option shows the changes
+        compared to the left hand parent. To see the changes against
+        another parent, use::
+
+            bzr diff -r<chosen_parent>..X
 
         Show just the differences for file NEWS::