From 4196d444272f6096ee280660e39cfa8d5f7a3b74 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Wed, 10 Apr 2013 21:53:24 +0800
Subject: [PATCH] Add UTF-8 BOM in TortoiseMerge/BaseView.cpp because of
 non-ascii characters in strings

Fix compilation in Chinese Windows

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseMerge/BaseView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp
index 5ec4c4690..da205ad4a 100644
--- a/src/TortoiseMerge/BaseView.cpp
+++ b/src/TortoiseMerge/BaseView.cpp
@@ -1,4 +1,4 @@
-// TortoiseGitMerge - a Diff/Patch program
+// TortoiseGitMerge - a Diff/Patch program
 
 // Copyright (C) 2003-2013 - TortoiseSVN
 // Copyright (C) 2011-2012 Sven Strickroth <email@cs-ware.de>
-- 
2.11.4.GIT