Rev 1859: (jam) update help text for diff (bug #6391) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1859
revision-id: pqm at pqm.ubuntu.com-20060712151359-b22a8c043fa52eb7
parent: pqm at pqm.ubuntu.com-20060712135614-506cabdbbc31e947
parent: john at arbash-meinel.com-20060712123152-6654ee91c947f4c9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-07-12 16:13:59 +0100
message:
  (jam) update help text for diff (bug #6391)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060712123152-6654ee91c947f4c9
    parent: john at arbash-meinel.com-20060711200412-380ba7847fb3749d
    parent: pqm at pqm.ubuntu.com-20060712100927-6af9cbe9c9e6af3b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: diff-6391
    timestamp: Wed 2006-07-12 07:31:52 -0500
    message:
      [merge] bzr.dev 1856
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060711200412-380ba7847fb3749d
    parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: diff-6391
    timestamp: Tue 2006-07-11 15:04:12 -0500
    message:
      Annotate the diff examples to explain what they do