4 files changed, 56 insertions, 0 deletions
diff --git a/t/unclosed-conflict-head b/t/unclosed-conflict-head
new file mode 100755
index 0000000..4a7f4a2
--- /dev/null
+++ b/t/unclosed-conflict-head
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} a" \
+	broken
+
+cp -- file file.original
+
+error file
+
+diff -u -- file file.original >&2
diff --git a/t/unclosed-conflict-head-parent b/t/unclosed-conflict-head-parent
new file mode 100755
index 0000000..ae4c501
--- /dev/null
+++ b/t/unclosed-conflict-head-parent
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} a" \
+	first \
+	"${PARENT} b" \
+	broken
+
+cp -- file file.original
+
+error file
+
+diff -u -- file file.original >&2
diff --git a/t/unclosed-conflict-head-parent-tail b/t/unclosed-conflict-head-parent-tail
new file mode 100755
index 0000000..c05ca5d
--- /dev/null
+++ b/t/unclosed-conflict-head-parent-tail
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} a" \
+	first \
+	"${PARENT} b" \
+	middle \
+	"${TAIL}" \
+	broken
+
+cp -- file file.original
+
+error file
+
+diff -u -- file file.original >&2
diff --git a/t/unclosed-conflict-head-tail b/t/unclosed-conflict-head-tail
new file mode 100755
index 0000000..b84755e
--- /dev/null
+++ b/t/unclosed-conflict-head-tail
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} a" \
+	first \
+	"${TAIL}" \
+	broken
+
+cp -- file file.original
+
+error file
+
+diff -u -- file file.original >&2