Merge lp:~jelmer/brz/cook-conflicts-split into lp:brz/3.1
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~jelmer/brz/cook-conflicts-split |
Merge into: | lp:brz/3.1 |
Diff against target: |
128 lines (+61/-49) 1 file modified
breezy/merge.py (+61/-49) |
To merge this branch: | bzr merge lp:~jelmer/brz/cook-conflicts-split |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email:
|
Commit message
Factor out conflict cookers.
Description of the change
Factor out conflict cookers.
To post a comment you must log in.