To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/tests/test_merge_core.py
- Committer: Breezy landing bot
- Date: 2020-08-10 04:24:51 UTC
- mfrom: (7490.129.10 conflict-refactor)
- mto: (7520.1.1 merge-3.1) (7490.133.18 transform) (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-20200810042451-kpabihsnzizmj75t
Split out bzr-specific Conflicts code.
Merged from https://code.launchpad.net/~jelmer/brz/conflict-refactor/+merge/388964
Merged from https://code.launchpad.net/~jelmer/brz/conflict-refactor/+merge/388964
- files added:
- breezy/bzr/conflicts.py
- files modified:
- breezy/builtins.py
added
removed
breezy/tests/test_merge_core.py
