comparison tests/test-push-hook-lock.out @ 3202:f8e67b7c57a4

Remove unneeded (and bashismic) export HGMERGE=true.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 30 Sep 2006 09:39:44 +0200
parents b2ae81a7df29
children 0750f11152fe
comparison
equal deleted inserted replaced
3201:1749987b29e3 3202:f8e67b7c57a4