From 0a1298765c999e9dd052181295f5b32e01707bee Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 2 Mar 2019 20:57:37 +1100
Subject: use sh intead of bash for the sake of testing on the docker image

---
 test/repos/merge_conflict.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/repos')

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
-- 
cgit v1.2.3