Skip to content

conflicts: Fix test to work with latest git version

Karthik Nayak requested to merge kn-fix-master into master

Recently we added git-attribute support for 'git-merge-tree(1)' in 2635c20f (git: Allow reading the attributes for 'git-merge-tree(1)'). While doing so, we also added a test for the same. Unfortunately the test fails on latest Git versions when the flag is disabled. We need to amend the test to also work in such situations.

Merge request reports