Merge branch 'pb/ref-filter-with-crlf'

[thirdparty/git.git] / t / t6200-fmt-merge-msg.sh

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 7d549748ef3015aade772944603e7b8efe20137b..f3e66eaf9bfe55cfa72a97461b23965013aa3d92 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' '
        head -n1 full.2 >actual &&
        grep -e "Merge branch .side. into master$" actual &&
 
-       git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
+       git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
        head -n1 full.3 >actual &&
        grep -e "Merge branch .side." actual &&
        ! grep -e " into master$" actual