← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: James Henstridge
  • Date: 2006-06-12 15:17:23 UTC
  • mto: (1711.2.53 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1786.
  • Revision ID: james.henstridge@canonical.com-20060612151723-9957f7e258567856
changes suggested by John Meinel

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import subprocess
17
18
import sys
18
 
import subprocess
19
19
from tempfile import NamedTemporaryFile
20
 
 
21
20
import time
22
21
 
23
22
from bzrlib.delta import compare_trees