From 3b226e7f010a3b8a4e8a8fad890862e47e3a190f Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Sat, 23 Aug 2003 20:31:11 +0000 Subject: [PATCH] Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument. --- Src/DiffContext.cpp | 1 + Src/readme.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp index 3276ad159..0060ae2b1 100644 --- a/Src/DiffContext.cpp +++ b/Src/DiffContext.cpp @@ -109,6 +109,7 @@ void CDiffContext::AddDiff(LPCTSTR pszFilename, LPCTSTR szSubdir { DIFFITEM di; di.sfilename = pszFilename; + di.sSubdir = szSubdir; di.left.spath = pszLeftDir; di.right.spath = pszRightDir; di.left.mtime = lmtime; diff --git a/Src/readme.txt b/Src/readme.txt index ad73d50fd..a4cf9bf8d 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -13,6 +13,8 @@ MergeDoc.cpp resource.h WinMerge new files: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h + Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument. + WinMerge:: DiffContext.cpp 2003-08-22 Kimmo PATCH: [ 787495 ] Create diffutils class (CDiffWrapper) -- 2.11.0