Rev 1707: Use patience for two-way merge in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1707
revision-id: pqm at pqm.ubuntu.com-20060525225841-625f0ece2f64af43
parent: pqm at pqm.ubuntu.com-20060525092836-8e8381f8f4d69909
parent: aaron.bentley at utoronto.ca-20060525220144-aad0dd7452ed8f9d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-25 23:58:41 +0100
message:
  Use patience for two-way merge
modified:
  bzrlib/tests/test_textmerge.py test_textmerge.py-20060408165803-fab93ab605a78e56
  bzrlib/textmerge.py            textmerge.py-20060408064938-a5d5c009e64a3a25
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060525220144-aad0dd7452ed8f9d
    parent: abentley at panoramicfeedback.com-20060523144244-2d714c3386cf3f76
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.patience
    timestamp: Thu 2006-05-25 18:01:44 -0400
    message:
      Use patience for two-way merge