diff tests/test-conflict @ 3553:3bab1fc0ab75

Turn bundle file into a string for http push, for urllib2 over proxies.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 27 Oct 2006 19:24:57 +0200
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff