when merging a branch, make sure all filters are applied

all

@@ -1129,6 +1129,11 @@ case "$cmd" in
 								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,*)