To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4869.3.15.
- Committer: Andrew Bennetts
- Date: 2009-12-22 07:18:54 UTC
- mto: (4869.3.19 per-file-merge-hook-491711) (4973.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4975.
- Revision ID: andrew.bennetts@canonical.com-20091222071854-7gjof5pcw6omg0ht
Refactor so that the default text merge is the final hook tried. Other hooks can now invoke it directly via merger.default_text_merge if they wish.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
