Rev 1694: Improved help for remerge and merge in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1694
revision-id: pqm at pqm.ubuntu.com-20060520144739-b795ddda465031a9
parent: pqm at pqm.ubuntu.com-20060519081516-cd19bd125a53a4d2
parent: aaron.bentley at utoronto.ca-20060519040005-a30f7a0983c1fc03
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-05-20 15:47:39 +0100
message:
  Improved help for remerge and merge
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060519040005-a30f7a0983c1fc03
    parent: aaron.bentley at utoronto.ca-20060519030107-355dcba3d5a133b8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2006-05-19 00:00:05 -0400
    message:
      Improved help for remerge and merge
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060519030107-355dcba3d5a133b8
    parent: abentley at panoramicfeedback.com-20060517125217-46dfd6c3be1b1193
    parent: pqm at pqm.ubuntu.com-20060518085327-89822346d9321aba
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-05-18 23:01:07 -0400
    message:
      Merge from bzr.dev