[Pkg-bazaar-commits] ./bzr/unstable r493: - Merge aaron's merge command

[Martin Pool]

------------------------------------------------------------
revno: 493
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-05-15 12:36:04 +1000
message:
  - Merge aaron's merge command
added:
  bzrlib/changeset.py
  bzrlib/merge.py
  bzrlib/merge_core.py
  bzrlib/patch.py
modified:
  bzrlib/add.py
  bzrlib/branch.py
  bzrlib/commands.py
-------------- next part --------------
Diff too large for email (2442 lines, the limit is 1000).