[merge] update to external diff fixes

[Robert Collins]

On Tue, 2006-08-15 at 12:53 -0500, John Arbash Meinel wrote:
> -from tempfile import TemporaryFile
> +import subprocess
> +from tempfile import TemporaryFile, mkdtemp 

+1 if you can explain what this is for :)

-Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060816/0d42bdb9/attachment.pgp