merge_recursive: Fix renames across paths below D/F conflicts

diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index 85351aea249bf0cca160355ace327e352b9852d4..055ad00f778eda1de02a418bbc602e580acdaca1 100755 (executable)
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -25,7 +25,7 @@ check_perms_and_acl () {
        getfacl "$1" > actual &&
        grep -q "user:root:rwx" actual &&
        grep -q "user:${LOGNAME}:rwx" actual &&
-       grep -q "mask::r--" actual &&
+       egrep "mask::?r--" actual > /dev/null 2>&1 &&
        grep -q "group::---" actual || false
 }