Rev 2164: Add --text parameter to conflicts in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2164
revision-id: pqm at pqm.ubuntu.com-20061206021529-c4235ec44babfd5b
parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
parent: abentley at panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-06 02:15:29 +0000
message:
  Add --text parameter to conflicts
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061205221551-uopn4nd9prt1ei2s
    parent: abentley at panoramicfeedback.com-20061205220514-elno4ql3b8b6thr3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-12-05 17:15:51 -0500
    message:
      Add --text parameter to conflicts
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061205220514-elno4ql3b8b6thr3
    parent: abentley at panoramicfeedback.com-20061128215647-h3eshzyuchz6q1p1
    parent: pqm at pqm.ubuntu.com-20061205003150-99103d2833c4a362
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-12-05 17:05:14 -0500
    message:
      Merge bzr.dev