/brz/remove-bazaar

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/merge3.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 03:10:29 UTC
  • mfrom: (7312 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190603031029-b34je03bjulxxdwj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge3.py
19
19
# mbp: "you know that thing where cvs gives you conflict markers?"
20
20
# s: "i hate that."
21
21
 
 
22
import patiencediff
 
23
 
 
24
 
22
25
from . import (
23
26
    errors,
24
 
    patiencediff,
25
27
    textfile,
26
28
    )
27
29