From 73ee409b2fff0c4d4839fcee86abf0fe0b7d23a3 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Tue, 8 Jan 2013 08:16:12 +0100
Subject: [PATCH] Store new names in registry

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseGitSetup/StructureFragment.wxi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 2b3e1359a..ab289e7eb 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -673,7 +673,7 @@
 					</Component>
 
 					<Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">
-						<RegistryValue Root="HKCU" Key="Software\TortoiseGit" KeyPath="yes" Name="TortoiseMerge" Value="TortoiseMerge" Type="string" />
+						<RegistryValue Root="HKCU" Key="Software\TortoiseGit" KeyPath="yes" Name="TortoiseMerge" Value="TortoiseGitMerge" Type="string" />
 						<Shortcut Id="S__TortoiseMerge" Directory="D_TortoisePrgMenu" ShortName="TMERGE" Name="TortoiseGitMerge" Advertise="no" Target="[INSTALLDIR]bin\TortoiseGitMerge.exe" Description="View Diff's, Merge Diff's, Resolve Conflicted Files and Apply Patches" Show="normal" />
 					</Component>
 
@@ -698,7 +698,7 @@
 					</Component>
 
 					<Component Id="C__TortoiseIDiffShortcuts" Guid="$(var.GuidTortoiseIDiffShortcuts)" Win64="$(var.Win64YesNo)">
-						<RegistryValue Root="HKCU" Key="Software\TortoiseGit" KeyPath="yes" Name="TortoiseIDiff" Value="TortoiseIDiff" Type="string" />
+						<RegistryValue Root="HKCU" Key="Software\TortoiseGit" KeyPath="yes" Name="TortoiseIDiff" Value="TortoiseGitIDiff" Type="string" />
 						<Shortcut Id="S__TortoiseIDiff" Directory="D_TortoisePrgMenu" ShortName="TIDIFF" Name="TortoiseGitIDiff" Advertise="no" Target="[INSTALLDIR]bin\TortoiseGitIDiff.exe" Description="View Diff's of image files" Show="normal" />
 					</Component>
 
-- 
2.11.4.GIT