Rev 2063: Fix diff3 merges to not indicate conflicts on clean merges in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2063
revision-id: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 05:18:29 +0100
message:
  Fix diff3 merges to not indicate conflicts on clean merges
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
    parent: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-10-05 00:05:12 -0400
    message:
      Update test case style
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
    parent: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-10-04 14:40:24 -0400
    message:
      Fix diff3 conflict-reporting bug
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
    parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
    parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-10-04 09:15:43 -0400
    message:
      Merge bzr.dev