X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=24ccf7e297f7dd7fc8c5c79f38265e6ecf96d60c;hb=982d6ae6123195c0c38f1f65354c41f4133f8e59;hp=6028133a21b38bd6518e0bc7bad1471581ca25be;hpb=e7f59af8133f6e80a4a18b171664af8517555360;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 6028133a..24ccf7e2 100644
--- a/tests/lib
+++ b/tests/lib
@@ -66,6 +66,7 @@ ln -f $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
 unset VISUAL
+unset GIT_EDITOR
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
@@ -1025,6 +1026,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}