blob: 8cd186bae39c9fbba21e8d604f39436066a9bb19 (
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
set_conflict_marker_size 3 small
printf '%s\n' > small \
"${HEAD} small-head" \
shared \
"${TAIL}" \
shared \
"${END} small-tail"
printf '%s\n' > small.expected \
shared
set_conflict_marker_size 10 large
printf '%s\n' > large \
"${HEAD} large-head" \
shared \
"${TAIL}" \
shared \
"${END} large-tail"
printf '%s\n' > large.expected \
shared
normal small large
also_interactive rr
|
