diff --git a/tests/test-conflict b/tests/test-conflict --- a/tests/test-conflict +++ b/tests/test-conflict @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -x hg init