diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-07-21 17:48:27 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-07-21 17:48:27 +1000 |
commit | fab194e9239c28e20191848c1d6a9c7b4f4c7fc6 (patch) | |
tree | 9593b4a300d020f3a370b091a191d14bfefdf45c /test | |
parent | a47c889cbb385e93e895a257e12038a5827c45b8 (diff) |
better handling of merge conflicts
Diffstat (limited to 'test')
-rwxr-xr-x | test/generate_basic_repo.sh | 12 |
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" |