diff options
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -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} |