From fab194e9239c28e20191848c1d6a9c7b4f4c7fc6 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 21 Jul 2018 17:48:27 +1000 Subject: better handling of merge conflicts --- test/generate_basic_repo.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test') 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" -- cgit v1.2.3