From 37d9ed6712a529c5264ced2967c7aa504d893af9 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 21 Jul 2018 15:57:54 +1000
Subject: test script to make repo with a merge conflict

---
 test/generate_basic_repo.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 test/generate_basic_repo.sh

diff --git a/test/generate_basic_repo.sh b/test/generate_basic_repo.sh
new file mode 100755
index 000000000..e7f567a23
--- /dev/null
+++ b/test/generate_basic_repo.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# this script will make a repo with a master and develop branch, where we end up
+# on the master branch and if we try and merge master we get a merge conflict
+
+# -e means exit if something fails
+# -x means print out simple commands before running them
+set -ex
+
+reponame="testrepo"
+
+rm -rf ${reponame}
+mkdir ${reponame}
+cd ${reponame}
+
+git init
+
+echo "Here is a story that has been told throuhg the ages" >> file1
+git add file1
+git commit -m "first commit"
+
+git checkout -b develop
+
+echo "once upon a time there was a dog" >> file1
+git add file1
+git commit -m "first commit on develop"
+
+git checkout master
+
+echo "once upon a time there was a cat" >> file1
+git add file1
+git commit -m "first commit on develop"
+
+git merge develop # should have a merge conflict here
-- 
cgit v1.2.3