diff templates/map @ 6517:fcfb6a0a0a84

python-2.6: use sha wrapper from util for new merge code
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 11 Apr 2008 12:04:26 +0200
parents 673d8a6bc709
children ccc2481e3954
line wrap: on
line diff