Rev 1624: Implement single-file merge in /home/pqm/archives/thelove/bzr/+trunk/

Mon Apr 10 06:26:38 BST 2006

------------------------------------------------------------
revno: 1624
revision-id: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
parent: pqm at pqm.ubuntu.com-20060410051538-e33ae09cf879c95b
parent: aaron.bentley at utoronto.ca-20060409061954-d0f04c8e0164a935
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-10 06:26:37 +0100
message:
  Implement single-file merge
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060409061954-d0f04c8e0164a935
    parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: mergeui
    timestamp: Sun 2006-04-09 02:19:54 -0400
    message:
      Implement single-file merge