Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 4d2ab43036ef…

Parents 8f7c2b92556a…

Parents 0162d25e318e…

by Steve Borho

Changes to one file · Browse files at 4d2ab43036ef Showing diff from parent 8f7c2b92556a 0162d25e318e Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
297
298
299
300
 
 
 
 
 
301
302
303
 
297
298
299
 
300
301
302
303
304
305
306
307
@@ -297,7 +297,11 @@
  dodiff(tmproot)   finally:   ui.note(_('cleaning up temp directory\n')) - shutil.rmtree(tmproot) + try: + shutil.rmtree(tmproot) + except (IOError, OSError), e: + # Leaking temporary files, fix your diff tool config + ui.note(_('unable to clean temp directory: %s\n'), str(e))     tmproot = tempfile.mkdtemp(prefix='visualdiff.')   if opts.get('mainapp'):