TortoiseGitMerge: Handle utf-16 files that don't have a BOM

Also update TortoiseGitBlame which relies on the enum defined in TortoiseGitMerge

Based on TortoiseSVN revision 24555

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>