From c2b915da6c0472c6263ac10812a866631b2331bf Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Thu, 31 Jan 2013 22:59:47 +0100
Subject: [PATCH] Fixed typo

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/Tortoise.pot            | 2 +-
 src/Resources/TortoiseMergeENG.rc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index 8d38df728..fad3c7732 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -293,7 +293,7 @@ msgid "&About TortoiseGitBlame..."
 msgstr ""
 
 #. Resource IDs: (57664)
-msgid "&About TortoiseMerge..."
+msgid "&About TortoiseGitMerge..."
 msgstr ""
 
 #. Resource IDs: (16920)
diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc
index 609901e96..d1d7ad8e0 100644
--- a/src/Resources/TortoiseMergeENG.rc
+++ b/src/Resources/TortoiseMergeENG.rc
@@ -492,7 +492,7 @@ BEGIN
     BEGIN
         MENUITEM "&Help Topics",                ID_HELP
         MENUITEM SEPARATOR
-        MENUITEM "&About TortoiseMerge...",     ID_APP_ABOUT
+        MENUITEM "&About TortoiseGitMerge...",  ID_APP_ABOUT
     END
 END
 
-- 
2.11.4.GIT