← Back to branch summary

~jelmer/brz/appveyor

« back to all changes in this revision

Viewing changes to breezy/shelf_ui.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-05-29 00:23:59 UTC
  • mfrom: (7290.14.6 external-patiencediff)
  • Revision ID: breezy.the.bot@gmail.com-20190529002359-8cyjs8gq5d096ry0
Use external patiencediff.

Merged from https://code.launchpad.net/~jelmer/brz/external-patiencediff/+merge/363891

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf_ui.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
 
19
import patiencediff
19
20
import shutil
20
21
import sys
21
22
import tempfile
29
30
    errors,
30
31
    osutils,
31
32
    patches,
32
 
    patiencediff,
33
33
    shelf,
34
34
    textfile,
35
35
    trace,