blob: baf9e1b79efa0904992596607af5f9497e75827e (
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
|
#!/bin/sh -e
. t/common.sh
interactive
printf '%s\n' > file \
"${HEAD} ours" \
head \
"${TAIL}" \
tail \
"${END} theirs"
printf '%s\n' > file.expected \
"${HEAD} ours" \
head \
"${TAIL}" \
tail \
"${END} theirs"
(
interactive_marker "${HEAD} ours"
interactive_side head
interactive_marker "${TAIL}"
interactive_side tail
interactive_marker "${END} theirs"
interactive_prompt 1 1
) > output.expected
printf '%s' s > input
conflict --interactive file 8<input 9>output
diff -u -- output.expected output >&2
|
