diff templates/manifest.tmpl @ 792:49ec802b4a16

Added tests for bug with three-way-merging of old tip, tip and cwd.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jul 2005 17:14:05 +0100
parents e5d769afd3ef
children 87d40e085e08 5197fb9d65d5 4f81068ed8cd
line wrap: on
line diff