Rev 2353: Merge autodetects line ending for conflict markers in /home/pqm/archives/thelove/bzr/+trunk/

Tue Mar 13 17:57:56 GMT 2007

------------------------------------------------------------
revno: 2353
revision-id: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 17:57:55 +0000
message:
  Merge autodetects line ending for conflict markers
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
  bzrlib/tests/test_merge3.py    merge3.py-20050704130834-556689114c89e6f2
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
    parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
    parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-03-13 12:45:23 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
    parent: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-03-13 10:07:07 -0400
    message:
      Add news entry
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
    parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2007-03-12 15:56:41 -0400
    message:
      merge3 auto-detects line endings for conflict markers