To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4869.3.17.
- Committer: Andrew Bennetts
- Date: 2009-12-22 09:03:17 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-20091222090317-zk86d4b1ry2zzoqn
Remove contents_conflict nested function, replace last callsite with simpler form.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
