reportecho4 "--> test failed, postponed"
fi
else
+ # apply crlf, or other cleanup filters (non-behavioural changes)
+ git reset --hard
+ find . -type f -exec touch {} \;
+ git commit -a --amend -c HEAD
+
echo "MERGING"
case ",`repoflags "$d"`," in
*,svn,*)