Rev 1816: (erik bågfors) remove duplicate lines in help and NEWS (bug #50561) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1816
revision-id: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
parent: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-27 14:31:54 +0100
message:
  (erik bågfors) remove duplicate lines in help and NEWS (bug #50561)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
    parent: john at arbash-meinel.com-20060627121621-e669e881b9578105
    parent: erik at bagfors.nu-20060611182629-df10b9c49e54be8d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-06-27 07:20:08 -0500
    message:
      [merge] Erik Bagfors: remove duplicate help (bug #50561)
        ------------------------------------------------------------
        merged: erik at bagfors.nu-20060611182629-df10b9c49e54be8d
        parent: erik at bagfors.nu-20060611182622-149f12eecd418eb3
        committer: Erik BÃ¥gfors <erik at bagfors.nu>
        branch nick: bzr.fixes
        timestamp: Sun 2006-06-11 20:26:29 +0200
        message:
          remove duplicate text from "help pull"
        ------------------------------------------------------------
        merged: erik at bagfors.nu-20060611182622-149f12eecd418eb3
        parent: pqm at pqm.ubuntu.com-20060611151400-2bf5c558ffe989f7
        committer: Erik BÃ¥gfors <erik at bagfors.nu>
        branch nick: bzr.fixes
        timestamp: Sun 2006-06-11 20:26:22 +0200
        message:
          removed duplication news entry
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060627121621-e669e881b9578105
    parent: john at arbash-meinel.com-20060623162626-de7ec2a984935589
    parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-06-27 07:16:21 -0500
    message:
      [merge] bzr.dev 1815