1 files changed, 30 insertions, 0 deletions
diff --git a/t/mixed-marker-sizes b/t/mixed-marker-sizes
new file mode 100755
index 0000000..8cd186b
--- /dev/null
+++ b/t/mixed-marker-sizes
@@ -0,0 +1,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