/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/shelf_ui.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/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,