From 2b3bdc8b8ff2a7391796acc692e994b309a2fa0a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 12 Aug 2018 11:05:21 +1000
Subject: [PATCH] rename merge conflict test repo

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

diff --git a/test/merge_conflict.sh b/test/merge_conflict.sh
index 9bd12bf569f..f255640b39a 100755
--- a/test/merge_conflict.sh
+++ b/test/merge_conflict.sh
@@ -10,7 +10,7 @@
 # -x means print out simple commands before running them
 set -ex
 
-reponame="testrepo"
+reponame="merge_conflict"
 
 rm -rf ${reponame}
 mkdir ${reponame}