/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 bzrlib/mergetools.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mergetools.py
24
24
import sys
25
25
import tempfile
26
26
 
27
 
from .lazy_import import lazy_import
 
27
from bzrlib.lazy_import import lazy_import
28
28
lazy_import(globals(), """
29
 
from breezy import (
 
29
from bzrlib import (
30
30
    cmdline,
31
31
    osutils,
32
32
    trace,
116
116
    arg = arg.replace('{this}', subst_names['this'])
117
117
    arg = arg.replace('{other}', subst_names['other'])
118
118
    arg = arg.replace('{result}', subst_names['result'])
119
 
    if 'this_temp' in subst_names:
 
119
    if subst_names.has_key('this_temp'):
120
120
        arg = arg.replace('{this_temp}', subst_names['this_temp'])
121
121
    return arg
122
122