blob: a2795416bd7b1fdb11a1a2fbf0e2430c2a8b06ea (
plain) (
blame)
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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
#!/bin/sh -e
. t/common.sh
interactive
printf '%s\n' > file \
"${HEAD} ours" \
head \
"${PARENT} base" \
base \
"${TAIL}" \
tail \
"${END} theirs" \
"${HEAD} ours" \
head \
"${PARENT} base" \
base \
"${TAIL}" \
tail \
"${END} theirs" \
"${HEAD} ours" \
head \
"${PARENT} base" \
base \
"${TAIL}" \
tail \
"${END} theirs" \
"${HEAD} ours" \
first \
"${PARENT} base" \
not first \
"${TAIL}" \
not first \
"${END} theirs" \
"${HEAD} ours" \
ours \
common \
"${PARENT} base" \
base \
common \
"${TAIL}" \
theirs \
common \
"${END} theirs"
printf '%s\n' > file.expected \
head \
tail \
"${HEAD} ours" \
head \
"${TAIL}" \
tail \
"${END} theirs" \
first \
"${HEAD} ours" \
ours \
"${PARENT} base" \
base \
"${TAIL}" \
theirs \
"${END} theirs" \
common
(
interactive_marker "${HEAD} ours"
interactive_side head
interactive_marker "${PARENT} base"
interactive_base base
interactive_marker "${TAIL}"
interactive_side tail
interactive_marker "${END} theirs"
interactive_prompt 1 5
interactive_marker "${HEAD} ours"
interactive_side head
interactive_marker "${PARENT} base"
interactive_base base
interactive_marker "${TAIL}"
interactive_side tail
interactive_marker "${END} theirs"
interactive_prompt 2 5
interactive_marker "${HEAD} ours"
interactive_side head
interactive_marker "${PARENT} base"
interactive_base base
interactive_marker "${TAIL}"
interactive_side tail
interactive_marker "${END} theirs"
interactive_prompt 3 5
interactive_marker "${HEAD} ours"
interactive_side first
interactive_marker "${PARENT} base"
interactive_base not
interactive_base first
interactive_marker "${TAIL}"
interactive_side not
interactive_side first
interactive_marker "${END} theirs"
interactive_prompt 4 5
interactive_marker "${HEAD} ours"
interactive_side ours
interactive_side common
interactive_marker "${PARENT} base"
interactive_base base
interactive_base common
interactive_marker "${TAIL}"
interactive_side theirs
interactive_side common
interactive_marker "${END} theirs"
interactive_prompt 5 5
) > output.expected
printf '%s' htbmr > input
conflict --interactive file 8<input 9>output
diff -u -- output.expected output >&2
|
