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

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/patiencediff.py
82
82
        tofiledate = '\t' + str(tofiledate)
83
83
 
84
84
    started = False
85
 
    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):
 
85
    for group in sequencematcher(None, a, b).get_grouped_opcodes(n):
86
86
        if not started:
87
87
            yield '--- %s%s%s' % (fromfile, fromfiledate, lineterm)
88
88
            yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)