From ed52d8ee89463bcab2b39067f519ea2477944c5d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 17 Nov 2012 20:01:10 +0100 Subject: [PATCH] Fixed titles Signed-off-by: Sven Strickroth --- src/TortoiseProc/AppUtils.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 1b4aef3b0..d000e2235 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -1448,8 +1448,16 @@ bool CAppUtils::ConflictEdit(CTGitPath &path,bool /*bAlternativeTool*/,bool reve CTGitPath mine; CTGitPath base; - mine.SetFromGit(GetMergeTempFile(_T("LOCAL"),merge)); - theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"),merge)); + if (revertTheirMy) + { + mine.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge)); + theirs.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge)); + } + else + { + mine.SetFromGit(GetMergeTempFile(_T("LOCAL"), merge)); + theirs.SetFromGit(GetMergeTempFile(_T("REMOTE"), merge)); + } base.SetFromGit(GetMergeTempFile(_T("BASE"),merge)); CString format; @@ -1513,9 +1521,9 @@ bool CAppUtils::ConflictEdit(CTGitPath &path,bool /*bAlternativeTool*/,bool reve { merge.SetFromWin(g_Git.m_CurrentDir+_T("\\")+merge.GetWinPathString()); if( revertTheirMy ) - bRet = !!CAppUtils::StartExtMerge(base,mine, theirs, merge,_T("BASE"),_T("LOCAL"),_T("REMOTE")); + bRet = !!CAppUtils::StartExtMerge(base, mine, theirs, merge, _T("BASE"), _T("REMOTE"), _T("LOCAL")); else - bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL")); + bRet = !!CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"), _T("REMOTE"), _T("LOCAL")); } else -- 2.11.4.GIT