Add Help button handle and add Anchor at format patch for refbrowse button

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / MergeWizardReintegrate.cpp

diff --git a/src/TortoiseProc/MergeWizardReintegrate.cpp b/src/TortoiseProc/MergeWizardReintegrate.cpp
index f1dd2c9..35a6178 100644 (file)
--- a/src/TortoiseProc/MergeWizardReintegrate.cpp
+++ b/src/TortoiseProc/MergeWizardReintegrate.cpp
@@ -73,8 +73,8 @@ BOOL CMergeWizardReintegrate::OnInitDialog()
 \r
        CString sUUID = ((CMergeWizard*)GetParent())->sUUID;\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
-       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"), FALSE))\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\MergeWCURL"), FALSE))\r
                m_URLCombo.SetCurSel(0);\r
 \r
        SetDlgItemText(IDC_WCEDIT, ((CMergeWizard*)GetParent())->wcPath.GetWinPath());\r
@@ -136,7 +136,7 @@ void CMergeWizardReintegrate::OnBnClickedShowmergelog()
                        m_pLogDlg->DestroyWindow();\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
@@ -163,7 +163,7 @@ void CMergeWizardReintegrate::OnBnClickedShowlogwc()
                m_pLogDlg2->DestroyWindow();\r
        delete m_pLogDlg2;\r
        m_pLogDlg2 = new CLogDlg();\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
        int limit = (int)(LONG)reg;\r
        m_pLogDlg2->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r