1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-27 00:51:18 +02:00
Files
lazygit/test/integration/mergeConflictsResolvedExternally/setup.sh

28 lines
349 B
Bash

#!/bin/sh
cd $1
git init
git config user.email "CI@example.com"
git config user.name "CI"
git checkout -b master
echo "master1" > file
git add .
git commit -m "master1"
git checkout -b other
echo "other1" > file
git add .
git commit -m "other1"
git checkout master
echo "master2" > file
git add .
git commit -m "master2"
git checkout other