From 6e44b123127eea188afe2903def02e9299347660 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Tue, 1 Jul 2014 14:06:56 +0800
Subject: [PATCH] Pass reflected names to TortoiseGitMerge when diffing local
 files and repository files

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseProc/AppUtils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index ae1bef897..2b1c3017c 100644
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -468,7 +468,8 @@ bool CAppUtils::StartExtDiff(
 	{
 		viewer =
 			_T("\"") + CPathUtils::GetAppDirectory() + _T("TortoiseGitMerge.exe") + _T("\"") +
-			_T(" /base:%base /mine:%mine /basename:%bname /minename:%yname");
+			_T(" /base:%base /mine:%mine /basename:%bname /minename:%yname") +
+			_T(" /basereflectedname:%bpath /minereflectedname:%ypath");
 		if (!g_sGroupingUUID.IsEmpty())
 		{
 			viewer += L" /groupuuid:\"";
-- 
2.11.4.GIT