[Winmerge-svn] SF.net SVN: winmerge: [5220] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-03-31 15:20:22
|
Revision: 5220 http://winmerge.svn.sourceforge.net/winmerge/?rev=5220&view=rev Author: kimmov Date: 2008-03-31 08:20:16 -0700 (Mon, 31 Mar 2008) Log Message: ----------- BUG: [ 1918599 ] Files in same folder marked different (Quick Compare) Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/CompareEngines/ByteCompare.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-03-31 15:03:19 UTC (rev 5219) +++ trunk/Docs/Users/ChangeLog.txt 2008-03-31 15:20:16 UTC (rev 5220) @@ -16,6 +16,7 @@ data (#1915424) BugFix: Print area was not clipped correctly. (#1915536) BugFix: Undo after pane swapping (#1915536, #1923625) + BugFix: Quick compare for same folder didn't show differences (#1918599) Translation updates: - Brazilian (#1913723) - Chinese Traditional (#1927605) Modified: trunk/Src/CompareEngines/ByteCompare.cpp =================================================================== --- trunk/Src/CompareEngines/ByteCompare.cpp 2008-03-31 15:03:19 UTC (rev 5219) +++ trunk/Src/CompareEngines/ByteCompare.cpp 2008-03-31 15:20:16 UTC (rev 5220) @@ -167,7 +167,7 @@ if (m_inf[0].desc == m_inf[1].desc) { location[1].encoding = location[0].encoding; - return diffcode; + return diffcode | DIFFCODE::SAME; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |