X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=e2496b43a0355d45f67fc345622df66705c8de33;hp=6028133a21b38bd6518e0bc7bad1471581ca25be;hb=9fe91f98a08e948bf3e282cd17f7c2637669a216;hpb=79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd

diff --git a/tests/lib b/tests/lib
index 6028133a..e2496b43 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1025,6 +1025,18 @@ t-make-badcommit () {
 	t-expect-fsck-fail $badcommit
 }
 
+t-merge-conflicted-stripping-conflict-markers () {
+	local otherbranch=$1
+	local file=$2
+
+	t-expect-fail F:"Merge conflict in $file" \
+	git merge $otherbranch
+
+	perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' "$file"
+	git add "$file"
+	git commit --no-edit
+}
+
 t-commit () {
 	local msg=$1
 	v=${2:-${majorv:-1}.$revision}