Rev 2086: skip non-content conflicts during remerge in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2086
revision-id: pqm at pqm.ubuntu.com-20061018044551-2402262928119383
parent: pqm at pqm.ubuntu.com-20061018043629-1f09a4f1ce6e4566
parent: john at arbash-meinel.com-20061017080414-2cfbe3b23bd06f33
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-18 05:45:51 +0100
message:
  skip non-content conflicts during remerge
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061017080414-2cfbe3b23bd06f33
    parent: john at arbash-meinel.com-20061016063832-1076fda126f4429e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: no-warnings
    timestamp: Tue 2006-10-17 18:04:14 +1000
    message:
      remerge only supports text or content conflicts