← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mergetools.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-08 09:24:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6351.
  • Revision ID: v.ladeuil+lp@free.fr-20111208092406-ueqyyoftzwk22bq4
Open 2.5b5 for bug fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mergetools.py
16
16
 
17
17
"""Utility functions for managing external merge tools such as kdiff3."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import os
22
20
import shutil
23
21
import subprocess