/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-05-20 03:57:29 UTC
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190520035729-9rxvefxkvbbivygy
use default_user_agent function.

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
 
 
25
22
from . import (
26
23
    errors,
 
24
    patiencediff,
27
25
    textfile,
28
26
    )
29
27