To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 7490.40.98.
- Committer: Breezy landing bot
- Date: 2020-08-08 23:39:10 UTC
- mfrom: (7490.128.1 split-conflict-pass)
- mto: (7490.129.5 conflict-refactor) (7520.1.1 merge-3.1) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
- mto: This revision was merged to the branch mainline in revision 7521.
- Revision ID: breezy.the.bot@gmail.com-20200808233910-zjv7dc4dh3d140y0
Factor out resolvers in conflict resolution handling.
Merged from https://code.launchpad.net/~jelmer/brz/split-conflict-pass/+merge/388933
Merged from https://code.launchpad.net/~jelmer/brz/split-conflict-pass/+merge/388933
- files modified:
- breezy/transform.py
expand all
collapse all
added
removed
