To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4869.3.21.
- Committer: Andrew Bennetts
- Date: 2010-01-15 05:30:30 UTC
- mto: (4973.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4975.
- Revision ID: andrew.bennetts@canonical.com-20100115053030-1d6qd89pnj8hmb55
Pass kinds (not pairs) to MergeHookParams.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
