diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-28 19:12:35 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-28 19:12:35 +1000 |
commit | 7e1e97d050dd38b08e0131776bf130bae1fb1a4c (patch) | |
tree | ddf77f98afc9e005f7a739bef4ba1eb90448bc7b /test/repos | |
parent | 320ccdb22afc89e7bd77695eafb262281b323095 (diff) |
dont panic when catting directories
Diffstat (limited to 'test/repos')
-rwxr-xr-x | test/repos/merge_conflict.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/repos/merge_conflict.sh b/test/repos/merge_conflict.sh index 51e4c1ce6..357597719 100755 --- a/test/repos/merge_conflict.sh +++ b/test/repos/merge_conflict.sh @@ -13,9 +13,15 @@ function add_spacing { done } +mkdir directory +echo "test1" > directory/file +echo "test1" > directory/file2 + + echo "Here is a story that has been told throuhg the ages" >> file1 git add file1 +git add directory git commit -m "first commit" git checkout -b develop @@ -24,6 +30,11 @@ 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 + +echo "test2" > directory/file +echo "test2" > directory/file2 +git add directory + git commit -m "first commit on develop" git checkout master @@ -32,6 +43,11 @@ 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 + +echo "test3" > directory/file +echo "test3" > directory/file2 +git add directory + git commit -m "first commit on develop" git merge develop # should have a merge conflict here |