From d361c0338508425b88a04b7bf762e4ccd1f7b472 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 16 Nov 2011 19:11:01 +0100 Subject: [PATCH] Fixed issue #964: Can't mark conflict as resolved Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Git/GitStatusListCtrl.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 3a1fa1b51..f1a01fe32 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -6,6 +6,7 @@ Upgraded gitdll, libgit and tgit.exe to 1.7.7.2 * Fixed issue #936: Applying a stash from the list fails * Fixed issue #962: git_init in gitdll.c uses USERPROFILE for creating home + * Fixed issue #964: Can't mark conflict as resolved = Release 1.7.5.0 = == Features== diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index f0439906c..4acc51ac2 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -2454,7 +2454,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) output.Empty(); if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED) { - gitcmd.Format(_T("git.exe add -- \"%s\""),fentry->GetGitPathString()); + gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString()); if(g_Git.Run(gitcmd,&output,CP_ACP)) { CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR); -- 2.11.4.GIT