6952552c58591b2d421c850e3371084bb3a78bdd blob 729 bytes (raw)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
| | #!/bin/sh
test_description='merge style conflict markers configurations'
. ./test-lib.sh
fill () {
for i
do
echo "$i"
done
}
test_expect_success 'merge' '
test_create_repo merge &&
(
cd merge &&
fill 1 2 3 >content &&
git add content &&
git commit -m base &&
git checkout -b r &&
echo six >>content &&
git commit -a -m right &&
git checkout master &&
echo 7 >>content &&
git commit -a -m left &&
test_must_fail git merge r &&
! grep -E "\|+" content &&
git reset --hard &&
test_must_fail git -c merge.conflictstyle=diff3 merge r &&
grep -E "\|+" content &&
git reset --hard &&
test_must_fail git -c merge.conflictstyle=merge merge r &&
! grep -E "\|+" content
)
'
test_done
|
debug log:
solving 6952552c58 ...
found 6952552c58 in https://public-inbox.org/git/20210609192842.696646-2-felipe.contreras@gmail.com/
applying [1/1] https://public-inbox.org/git/20210609192842.696646-2-felipe.contreras@gmail.com/
diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh
new file mode 100755
index 0000000000..6952552c58
Checking patch t/t6440-config-conflict-markers.sh...
Applied patch t/t6440-config-conflict-markers.sh cleanly.
index at:
100755 6952552c58591b2d421c850e3371084bb3a78bdd t/t6440-config-conflict-markers.sh
Code repositories for project(s) associated with this inbox:
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).