Eskil

Differences From Artifact [f9b6f5c151]:

• Executable file mergetest-git.sh — part of check-in [500150bfc8] at 2011-05-10 21:51:52 on branch trunk — Added example in document for settings in git and fossil. (user: peter.spjuth@gmail.com size: 334)

To Artifact [52c9501724]:

• 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)

1
2
3
4
5
6
7
8
9
10
11
12

13
14
15
16

17
18

1
2
3
4
5
6
7
8
9
10
11

12
13
14
15

16
17
18

-
+



-
+

#!/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 master
git checkout main
cp ../tests/left.txt  a.txt
git commit -am l
git checkout b
#git merge master
#git merge main
#git mergetool
#git commit -am m