better handling of merge conflicts

1 files changed, 12 insertions, 0 deletions

diff --git a/test/generate_basic_repo.sh b/test/generate_basic_repo.sh
index 385ea8520..ef04333c7 100755
--- a/test/generate_basic_repo.sh
+++ b/test/generate_basic_repo.sh
@@ -18,19 +18,31 @@ cd ${reponame}
 
 git init
 
+function add_spacing {
+  for i in {1..60}
+  do
+    echo "..." >> $1
+  done
+}
+
 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
+add_spacing file1
+echo "once upon a time there was another 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
+add_spacing file1
+echo "once upon a time there was another cat" >> file1
 git add file1
 git commit -m "first commit on develop"