OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94698de
)
Fixed a bug where WinMerge sometimes didn't delete temporary files when comparing...
author
sdottaka
<none@none>
Sun, 25 Mar 2012 16:19:18 +0000
(
01:19
+0900)
committer
sdottaka
<none@none>
Sun, 25 Mar 2012 16:19:18 +0000
(
01:19
+0900)
Src/FolderCmp.cpp
patch
|
blob
|
history
diff --git
a/Src/FolderCmp.cpp
b/Src/FolderCmp.cpp
index
7d93466
..
9445920
100644
(file)
--- a/
Src/FolderCmp.cpp
+++ b/
Src/FolderCmp.cpp
@@
-430,8
+430,7
@@
int FolderCmp::prepAndCompareFiles(CDiffContext * pCtxt, DIFFITEM &di)
exitPrepAndCompare:
- if (pCtxt->m_bPluginsEnabled && (nCompMethod == CMP_CONTENT ||
- nCompMethod == CMP_QUICK_CONTENT))
+ if (nCompMethod == CMP_CONTENT || nCompMethod == CMP_QUICK_CONTENT)
{
m_diffFileData.Reset();
diffdata10.m_diffFileData.Reset();