--- a/tests/test-up-local-change Thu Jun 30 23:23:12 2005 -0800 +++ b/tests/test-up-local-change Thu Jun 30 23:28:16 2005 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh export HGMERGE=true