[Winmerge-svn] SF.net SVN: winmerge: [3982] trunk/Docs/Users/Manual
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-12-20 14:30:24
|
Revision: 3982 http://svn.sourceforge.net/winmerge/?rev=3982&view=rev Author: kimmov Date: 2006-12-20 06:30:18 -0800 (Wed, 20 Dec 2006) Log Message: ----------- PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different Modified Paths: -------------- trunk/Docs/Users/Manual/Changes.txt trunk/Docs/Users/Manual/Faq.xml Modified: trunk/Docs/Users/Manual/Changes.txt =================================================================== --- trunk/Docs/Users/Manual/Changes.txt 2006-12-19 21:10:11 UTC (rev 3981) +++ trunk/Docs/Users/Manual/Changes.txt 2006-12-20 14:30:18 UTC (rev 3982) @@ -1,3 +1,7 @@ +2006-12-20 Kimmo + PATCH: [ 1618452 ] Manual: Add new FAQ item about all lines marked different + Manual: Faq.xml + 2006-12-11 Tim PATCH: [ 1611595 ] Manual: Merge Plugins.xml with readme_users.txt Manual: Plugins.xml Modified: trunk/Docs/Users/Manual/Faq.xml =================================================================== --- trunk/Docs/Users/Manual/Faq.xml 2006-12-19 21:10:11 UTC (rev 3981) +++ trunk/Docs/Users/Manual/Faq.xml 2006-12-20 14:30:18 UTC (rev 3982) @@ -209,8 +209,8 @@ <qandaset> <qandaentry> <question> - <para>WinMerge does not start and complains about missing DLL - files (mfc71.dll, mfc71u.dll, msvcr71.dll, msvcp71.dll)</para> + <para>WinMerge does not start and complains about missing DLL files + (mfc71.dll, mfc71u.dll, msvcr71.dll, msvcp71.dll)</para> </question> <answer> @@ -223,6 +223,30 @@ </sect2> <sect2> + <title>File Comparing</title> + + <qandaset> + <qandaentry> + <question> + <para>Why my files have all lines marked different (colored) even if + I know all lines are not different?</para> + </question> + + <answer> + <para>Maybe your files have different line-ending styles (e.g. DOS + and UNIX?). WinMerge by default compares also line-ending styles, + but you can disable it from <menuchoice> + <guimenu>Edit</guimenu> + + <guimenuitem>Options</guimenuitem> + </menuchoice> / Compare / Ignore carriage return + differences.</para> + </answer> + </qandaentry> + </qandaset> + </sect2> + + <sect2> <title>Questions about binary files</title> <qandaset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |