mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 21:05:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better handling of merge conflicts

Browse source
This commit is contained in:
Jesse Duffield 2018-07-21 17:48:27 +10:00
parent a47c889cbb
commit fab194e923
4 changed files with 248 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/generate_basic_repo.sh
View file

@ -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"