Rev 4820: (igc) better explanation of diff -c (#475451) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4820 [merge]
revision-id: pqm at pqm.ubuntu.com-20091123014435-71sjh9f83ull0oqj
parent: pqm at pqm.ubuntu.com-20091120185110-7muay17qmdqvrg7z
parent: ian.clatworthy at canonical.com-20091123005738-ls4r731x74s1410j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-11-23 01:44:35 +0000
message:
  (igc) better explanation of diff -c (#475451)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-11-20 05:54:54 +0000
+++ b/bzrlib/builtins.py	2009-11-23 00:57:38 +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::