diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 20:57:37 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 21:31:48 +1100 |
| commit | 0a1298765c999e9dd052181295f5b32e01707bee (patch) | |
| tree | 9ebc1dfd49d4e89325ce3b0c2ada37bd1684d28f /test | |
| parent | 273678f081549d9f09c46604fc686fa5fccc7682 (diff) | |
use sh intead of bash for the sake of testing on the docker image
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 |