From 4ff73fdb69fc20ce01520a68d0df835d9db32490 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Wed, 1 Feb 2017 18:01:39 +0100
Subject: [PATCH] Remove other false positives

---
 Scripts/developer_scripts/test_merge_of_branch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/test_merge_of_branch b/Scripts/developer_scripts/test_merge_of_branch
index 22b3dcc1ac6..fcf636c18ad 100755
--- a/Scripts/developer_scripts/test_merge_of_branch
+++ b/Scripts/developer_scripts/test_merge_of_branch
@@ -128,7 +128,7 @@ fi
 
 #check no file contains non-utf8 characters
 echo '.. Checking if non utf-8 characters are used...'
-txt_not_utf8=$(file -N `git ls-files --stage` | grep "text" | egrep -v "UTF-8|ASCII|XML|EPS|FIG")
+txt_not_utf8=$(file -N `git ls-files --stage` | grep "text" | egrep -v "UTF-8|ASCII|XML|EPS|FIG|assembler source|from flex")
 if [ -n "${txt_not_utf8}" ]; then
   echo "The following files have non utf-8 characters:"
   echo ${txt_not_utf8}