diff --git a/tests/test-up-local-change b/tests/test-up-local-change --- a/tests/test-up-local-change +++ b/tests/test-up-local-change @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh export HGMERGE=true