diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/repos/merge_conflict.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/repos/merge_conflict.sh b/test/repos/merge_conflict.sh index ca3fb13b9..88b5bfc18 100755 --- a/test/repos/merge_conflict.sh +++ b/test/repos/merge_conflict.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -ex; rm -rf repo; mkdir repo; cd repo git init |