Eskil

Artifact 52c950172467e924f8eeb325ce5fcdbc7d8906311e832ea55ea55cefdf7255b8:

• Executable file mergetest-git.sh — part of check-in [88bd8ecfdb] at 2024-09-08 00:55:52 on branch trunk — Added psmenu package. Use it for merge dialog. (user: peter size: 330)

#!/bin/sh
# Build up a merge conflict in git
mkdir apa_git
cd apa_git
git init
cp ../tests/ancestor.txt a.txt
git add a.txt
git commit -m a
git checkout -b b
cp ../tests/right.txt a.txt
git commit -am r
git checkout main
cp ../tests/left.txt  a.txt
git commit -am l
git checkout b
#git merge main
#git mergetool
#git commit -am m