Add /self-compare command line option

author Takashi Sawanaka <sdottaka@users.sourceforge.net>

Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)

committer Takashi Sawanaka <sdottaka@users.sourceforge.net>

Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)
author Takashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)
committer Takashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)
diff --git a/Docs/Manual/EN/Command_line.xml b/Docs/Manual/EN/Command_line.xml

index f5740e6..ec60f9d 100644 (file)
--- a/Docs/Manual/EN/Command_line.xml
+++ b/Docs/Manual/EN/Command_line.xml
@@ -58,6 +58,8 @@
  
        <arg choice="opt" rep="norepeat"><option>/wr</option></arg>
  
+      <arg choice="opt" rep="norepeat"><option>/self-compare</option></arg>
+
        <arg><option>/minimize</option></arg>
  
        <arg><option>/maximize</option></arg>
@@ -305,6 +307,13 @@
      </varlistentry>
  
      <varlistentry>
+      <term><option>/self-compare</option></term>
+      <listitem>
+        <para>Compares the specified file with a copy of the file.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
        <indexterm>
          <primary>WinMerge window</primary>
          <secondary>opening minimized or maximized</secondary>
@@ -485,5 +494,6 @@
          with a conflict file.</para>
        </listitem>
      </varlistentry>
+
    </variablelist>
  </article>
diff --git a/Docs/Manual/JP/Command_line.xml b/Docs/Manual/JP/Command_line.xml

index a9a4646..0c8bfd7 100644 (file)
--- a/Docs/Manual/JP/Command_line.xml
+++ b/Docs/Manual/JP/Command_line.xml
@@ -58,6 +58,8 @@
  
        <arg choice="opt" rep="norepeat"><option>/wr</option></arg>
  
+      <arg choice="opt" rep="norepeat"><option>/self-compare</option></arg>
+
        <arg><option>/minimize</option></arg>
  
        <arg><option>/maximize</option></arg>
@@ -304,6 +306,13 @@
      </varlistentry>
  
      <varlistentry>
+      <term><option>/self-compare</option></term>
+      <listitem>
+        <para>指定された１つのファイルとそのファイルのコピーを比較します。</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
        <indexterm>
          <primary>WinMergeウインドウ</primary>
          <secondary>最小化または最大化で開く</secondary>
@@ -487,5 +496,6 @@
          コンフリクトファイルと共に他のパスは使用できないことに注意してください。</para>
        </listitem>
      </varlistentry>
+
    </variablelist>
  </article>
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp

index 87414c1..b255d05 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -63,6 +63,7 @@
  #include "CCrystalTextMarkers.h"
  #include "utils/hqbitmap.h"
  #include "UniFile.h"
+#include "TFile.h"
  
  #include "WindowsManagerDialog.h"
  
@@ -2366,6 +2367,23 @@ bool CMainFrame::DoOpenConflict(const String& conflictFile, const String strDesc
         return conflictCompared;
  }
  
+bool CMainFrame::DoSelfCompare(const String& file, const String strDesc[] /*= nullptr*/)
+{
+       String ext = paths::FindExtension(file);
+       TempFilePtr wTemp(new TempFile());
+       String copiedFile = wTemp->Create(_T("self-compare_"), ext);
+       m_tempFiles.push_back(wTemp);
+
+       TFile(file).copyTo(copiedFile);
+
+       String strDesc2[2] = { 
+               (strDesc && !strDesc[0].empty()) ? strDesc[0] : _("Original File"),
+               (strDesc && !strDesc[1].empty()) ? strDesc[1] : _("") };
+       DWORD dwFlags[2] = {FFILEOPEN_READONLY | FFILEOPEN_NOMRU, FFILEOPEN_NOMRU};
+       PathContext tmpPathContext(copiedFile, file);
+       return DoFileOpen(&tmpPathContext, dwFlags, strDesc2);
+}
+
  /**
   * @brief Get type of frame (File/Folder compare).
   * @param [in] pFrame Pointer to frame to check.
diff --git a/Src/MainFrm.h b/Src/MainFrm.h

index 7fc648a..258454b 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -108,6 +108,7 @@ public:
         void StartFlashing();
         bool AskCloseConfirmation();
         bool DoOpenConflict(const String& conflictFile, const String strDesc[] = nullptr, bool checked = false);
+       bool DoSelfCompare(const String& file, const String strDesc[] = nullptr);
         FRAMETYPE GetFrameType(const CFrameWnd * pFrame) const;
         void UpdateDocTitle();
         void ReloadMenu();
diff --git a/Src/Merge.cpp b/Src/Merge.cpp

index 48916fa..8512333 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -682,7 +682,13 @@ bool CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
                 else if (cmdInfo.m_Files.GetSize() == 1)
                 {
                         String sFilepath = cmdInfo.m_Files[0];
-                       if (IsProjectFile(sFilepath))
+                       if (cmdInfo.m_bSelfCompare)
+                       {
+                               strDesc[0] = cmdInfo.m_sLeftDesc;
+                               strDesc[1] = cmdInfo.m_sRightDesc;
+                               bCompared = pMainFrame->DoSelfCompare(sFilepath, strDesc);
+                       }
+                       else if (IsProjectFile(sFilepath))
                         {
                                 bCompared = LoadAndOpenProjectFile(sFilepath);
                         }
diff --git a/Src/Merge.rc b/Src/Merge.rc

index 1f1b079..7d85ea8 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2865,6 +2865,7 @@ BEGIN
      IDS_CONFLICT_BASE_FILE  "Base File"\r
      IDS_CONFLICT_THEIRS_FILE "Theirs File"\r
      IDS_CONFLICT_MINE_FILE  "Mine File"\r
+    IDS_SELFCOMPARE_ORIGINAL_FILE "Original File"\r
  END\r
  \r
  // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)\r
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj

index 235e9f5..dfb6e13 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -1,1398 +1,1399 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Test|Win32">
-      <Configuration>Test</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Test|x64">
-      <Configuration>Test</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Merge</ProjectName>
-    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>
-    <RootNamespace>Merge</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
-    <XPDeprecationWarning>false</XPDeprecationWarning>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EmbedManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>
-    <TargetName>Win$(ProjectName)U</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <SDLCheck>true</SDLCheck>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <Profile>false</Profile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <BrowseInformation>false</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX64</TargetMachine>
-      <GenerateMapFile>true</GenerateMapFile>
-      <Profile>false</Profile>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\asp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\autoit.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\basic.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\batch.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\crystallineparser.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\cplusplus.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cregexp_poco.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cs2cs.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\csharp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\css.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\dcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\filesup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\fortran.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\fpattern.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\go.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\html.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\icu.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ini.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\innosetup.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\is.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\isx.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\java.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lisp.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lua.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\memcombo.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\nsis.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\pascal.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\perl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\php.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\plain.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\po.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\powershell.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\python.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\registry.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rexx.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rsrc.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ruby.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rust.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sgml.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sh.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\siod.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sql.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\string_util.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tcl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tex.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\verilog.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\vhdl.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\utils\wcwidth.cpp" />
-    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\xml.cpp" />
-    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xdiffi.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xemit.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xhistogram.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xmerge.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xpatience.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xprepare.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\Externals\xdiff\xutils.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="7zCommon.cpp">
-    </ClCompile>
-    <ClCompile Include="AboutDlg.cpp">
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ImageCompare.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Concurrent.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="Common\BCMenu.cpp" />
-    <ClCompile Include="Common\Bitmap.cpp" />
-    <ClCompile Include="charsets.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="DirSelectFilesDlg.cpp" />
-    <ClCompile Include="SubstitutionFiltersList.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeFrameCommon.cpp" />
-    <ClCompile Include="MergeEditFrm.cpp" />
-    <ClCompile Include="Common\ClipBoard.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\CMoveConstraint.cpp" />
-    <ClCompile Include="codepage_detect.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\ColorButton.cpp" />
-    <ClCompile Include="Common\ExConverter.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\BinaryCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareOptions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareStatisticsDlg.cpp" />
-    <ClCompile Include="CompareStats.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="ConfigLog.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />
-    <ClCompile Include="ConflictFileParser.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\coretools.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DropHandler.cpp" />
-    <ClCompile Include="ImgMergeFrm.cpp" />
-    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Merge7zFormatShellImpl.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeEditSplitterView.cpp" />
-    <ClCompile Include="MergeStatusBar.cpp" />
-    <ClCompile Include="OpenTableDlg.cpp" />
-    <ClCompile Include="OptionsDef.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsCustomColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffContext.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffFileData.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffFileInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffItem.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffItemList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffTextBuffer.cpp" />
-    <ClCompile Include="DiffThread.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DiffViewBar.cpp" />
-    <ClCompile Include="DiffWrapper.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirActions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirCmpReport.cpp" />
-    <ClCompile Include="DirCmpReportDlg.cpp" />
-    <ClCompile Include="DirColsDlg.cpp" />
-    <ClCompile Include="DirCompProgressBar.cpp" />
-    <ClCompile Include="DirDoc.cpp" />
-    <ClCompile Include="DirFrame.cpp" />
-    <ClCompile Include="DirItem.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirScan.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirTravel.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="DirView.cpp" />
-    <ClCompile Include="DirViewColItems.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="dllpstub.cpp" />
-    <ClCompile Include="EditorFilepathBar.cpp" />
-    <ClCompile Include="EncodingErrorBar.cpp" />
-    <ClCompile Include="Environment.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileActionScript.cpp" />
-    <ClCompile Include="FileFilter.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFilterHelper.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFilterMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileFiltersDlg.cpp" />
-    <ClCompile Include="FileOrFolderSelect.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FilepathEdit.cpp" />
-    <ClCompile Include="FileTextEncoding.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileTransform.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FileVersion.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FilterList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="FolderCmp.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="GhostTextBuffer.cpp" />
-    <ClCompile Include="GhostTextView.cpp" />
-    <ClCompile Include="HexMergeDoc.cpp" />
-    <ClCompile Include="HexMergeFrm.cpp" />
-    <ClCompile Include="HexMergeView.cpp" />
-    <ClCompile Include="Common\LanguageSelect.cpp" />
-    <ClCompile Include="JumpList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LineFiltersDlg.cpp" />
-    <ClCompile Include="SubstitutionFiltersDlg.cpp" />
-    <ClCompile Include="SubeditList.cpp" />
-    <ClCompile Include="LineFiltersList.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LoadSaveCodepageDlg.cpp" />
-    <ClCompile Include="locality.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="LocationBar.cpp" />
-    <ClCompile Include="LocationView.cpp" />
-    <ClCompile Include="Common\lwdisp.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="MainFrm.cpp" />
-    <ClCompile Include="markdown.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\MDITabBar.cpp" />
-    <ClCompile Include="Merge.cpp" />
-    <ClCompile Include="MergeApp.cpp" />
-    <ClCompile Include="MergeCmdLineInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MergeDoc.cpp" />
-    <ClCompile Include="MergeDocDiffSync.cpp" />
-    <ClCompile Include="MergeDocEncoding.cpp" />
-    <ClCompile Include="MergeDocLineDiffs.cpp" />
-    <ClCompile Include="MergeEditView.cpp" />
-    <ClCompile Include="Common\MessageBoxDialog.cpp" />
-    <ClCompile Include="MovedBlocks.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="MovedLines.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\multiformatText.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OpenDoc.cpp" />
-    <ClCompile Include="OpenFrm.cpp" />
-    <ClCompile Include="OpenView.cpp" />
-    <ClCompile Include="OptionsDiffColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsDiffOptions.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsDirColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Test|Win32">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Test|x64">\r
+      <Configuration>Test</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>Merge</ProjectName>\r
+    <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>\r
+    <RootNamespace>Merge</RootNamespace>\r
+    <Keyword>MFCProj</Keyword>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">7.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141_xp</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseOfMfc>Static</UseOfMfc>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>\r
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EmbedManifest>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\Build\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">.\..\BuildTmp\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\Build\$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Test|x64'">.\..\BuildTmp\$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</LinkIncremental>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>\r
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</EmbedManifest>\r
+    <TargetName>Win$(ProjectName)U</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>MinSpace</Optimization>\r
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;NDEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <StringPooling>true</StringPooling>\r
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>Win32</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN32;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <SDLCheck>true</SDLCheck>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">\r
+    <Midl>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MkTypLibCompatible>true</MkTypLibCompatible>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+      <HeaderFileName>\r
+      </HeaderFileName>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>.;..\Externals\gtest;..\Externals\gtest\include;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>TEST_WINMERGE;WINVER=0x0501;_DEBUG;WIN64;_WINDOWS;__NT__;POCO_STATIC;PR_FILE_NAME="pr";EDITPADC_CLASS=;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+      <BrowseInformation>false</BrowseInformation>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>Default</CompileAs>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <ControlFlowGuard>Guard</ControlFlowGuard>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <Culture>0x0409</Culture>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <AdditionalLibraryDirectories>..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <Profile>false</Profile>\r
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\asp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\autoit.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\basic.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\batch.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaleditview.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\crystallineparser.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\javascript.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\cplusplus.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\hqbitmap.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cregexp_poco.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaleditviewex.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystalparser.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\crystaltextblock.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\cs2cs.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\csharp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\css.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\dcl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\filesup.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\fortran.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\fpattern.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\go.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\html.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\icu.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ini.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\innosetup.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\is.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\isx.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\java.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\LineInfo.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lisp.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\lua.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\dialogs\memcombo.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\nsis.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\pascal.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\perl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\php.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\plain.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\po.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\powershell.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\python.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\registry.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rexx.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rsrc.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\ruby.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\rust.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sgml.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sh.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\siod.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\sql.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\string_util.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\SyntaxColors.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tcl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\tex.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\UndoRecord.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\verilog.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\vhdl.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\utils\wcwidth.cpp" />\r
+    <ClCompile Include="..\Externals\crystaledit\editlib\parsers\xml.cpp" />\r
+    <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xdiffi.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xemit.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xhistogram.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xmerge.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xpatience.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xprepare.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="..\Externals\xdiff\xutils.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="7zCommon.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="AboutDlg.cpp">\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ImageCompare.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Concurrent.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\BCMenu.cpp" />\r
+    <ClCompile Include="Common\Bitmap.cpp" />\r
+    <ClCompile Include="charsets.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="DirSelectFilesDlg.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersList.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeFrameCommon.cpp" />\r
+    <ClCompile Include="MergeEditFrm.cpp" />\r
+    <ClCompile Include="Common\ClipBoard.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\CMoveConstraint.cpp" />\r
+    <ClCompile Include="codepage_detect.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ColorButton.cpp" />\r
+    <ClCompile Include="Common\ExConverter.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareOptions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareStatisticsDlg.cpp" />\r
+    <ClCompile Include="CompareStats.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfigLog.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="ConfirmFolderCopyDlg.cpp" />\r
+    <ClCompile Include="ConflictFileParser.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\coretools.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DropHandler.cpp" />\r
+    <ClCompile Include="ImgMergeFrm.cpp" />\r
+    <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Merge7zFormatShellImpl.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditSplitterView.cpp" />\r
+    <ClCompile Include="MergeStatusBar.cpp" />\r
+    <ClCompile Include="OpenTableDlg.cpp" />\r
+    <ClCompile Include="OptionsDef.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsCustomColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffContext.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileData.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffFileInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItem.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffItemList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp" />\r
+    <ClCompile Include="DiffThread.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp" />\r
+    <ClCompile Include="DiffWrapper.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirActions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCmpReport.cpp" />\r
+    <ClCompile Include="DirCmpReportDlg.cpp" />\r
+    <ClCompile Include="DirColsDlg.cpp" />\r
+    <ClCompile Include="DirCompProgressBar.cpp" />\r
+    <ClCompile Include="DirDoc.cpp" />\r
+    <ClCompile Include="DirFrame.cpp" />\r
+    <ClCompile Include="DirItem.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirScan.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirTravel.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="DirView.cpp" />\r
+    <ClCompile Include="DirViewColItems.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="dllpstub.cpp" />\r
+    <ClCompile Include="EditorFilepathBar.cpp" />\r
+    <ClCompile Include="EncodingErrorBar.cpp" />\r
+    <ClCompile Include="Environment.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp" />\r
+    <ClCompile Include="FileFilter.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterHelper.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFilterMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileFiltersDlg.cpp" />\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp" />\r
+    <ClCompile Include="FileTextEncoding.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileTransform.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FileVersion.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FilterList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="FolderCmp.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp" />\r
+    <ClCompile Include="GhostTextView.cpp" />\r
+    <ClCompile Include="HexMergeDoc.cpp" />\r
+    <ClCompile Include="HexMergeFrm.cpp" />\r
+    <ClCompile Include="HexMergeView.cpp" />\r
+    <ClCompile Include="Common\LanguageSelect.cpp" />\r
+    <ClCompile Include="JumpList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LineFiltersDlg.cpp" />\r
+    <ClCompile Include="SubstitutionFiltersDlg.cpp" />\r
+    <ClCompile Include="SubeditList.cpp" />\r
+    <ClCompile Include="LineFiltersList.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LoadSaveCodepageDlg.cpp" />\r
+    <ClCompile Include="locality.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp" />\r
+    <ClCompile Include="LocationView.cpp" />\r
+    <ClCompile Include="Common\lwdisp.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp" />\r
+    <ClCompile Include="markdown.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp" />\r
+    <ClCompile Include="Merge.cpp" />\r
+    <ClCompile Include="MergeApp.cpp" />\r
+    <ClCompile Include="MergeCmdLineInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp" />\r
+    <ClCompile Include="MergeDocDiffSync.cpp" />\r
+    <ClCompile Include="MergeDocEncoding.cpp" />\r
+    <ClCompile Include="MergeDocLineDiffs.cpp" />\r
+    <ClCompile Include="MergeEditView.cpp" />\r
+    <ClCompile Include="Common\MessageBoxDialog.cpp" />\r
+    <ClCompile Include="MovedBlocks.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="MovedLines.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\multiformatText.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp" />\r
+    <ClCompile Include="OpenFrm.cpp" />\r
+    <ClCompile Include="OpenView.cpp" />\r
+    <ClCompile Include="OptionsDiffColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDiffOptions.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsDirColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
      <ClCompile Include="OptionsEditorSyntax.cpp">\r
        <PrecompiledHeader>Use</PrecompiledHeader>\r
        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
        <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
      </ClCompile>\r
-    <ClCompile Include="OptionsFont.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsInit.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="common\OptionsMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="OptionsPanel.cpp">
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="OptionsSyntaxColors.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PatchDlg.cpp" />
-    <ClCompile Include="PatchHTML.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PatchTool.cpp" />
-    <ClCompile Include="PathContext.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="paths.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\PidlContainer.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PluginManager.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Plugins.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PluginsListDlg.cpp" />
-    <ClCompile Include="Common\PreferencesDlg.cpp" />
-    <ClCompile Include="ProjectFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="PropArchive.cpp" />
-    <ClCompile Include="PropBackups.cpp" />
-    <ClCompile Include="PropCodepage.cpp" />
-    <ClCompile Include="PropColorSchemes.cpp" />
-    <ClCompile Include="PropCompareTable.cpp" />
+    <ClCompile Include="OptionsFont.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsInit.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="common\OptionsMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsSyntaxColors.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchDlg.cpp" />\r
+    <ClCompile Include="PatchHTML.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp" />\r
+    <ClCompile Include="PathContext.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="paths.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PidlContainer.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="pch.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginManager.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Plugins.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PluginsListDlg.cpp" />\r
+    <ClCompile Include="Common\PreferencesDlg.cpp" />\r
+    <ClCompile Include="ProjectFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="PropArchive.cpp" />\r
+    <ClCompile Include="PropBackups.cpp" />\r
+    <ClCompile Include="PropCodepage.cpp" />\r
+    <ClCompile Include="PropColorSchemes.cpp" />\r
+    <ClCompile Include="PropCompareTable.cpp" />\r
      <ClCompile Include="PropEditorSyntax.cpp" />\r
-    <ClCompile Include="PropMergeColors.cpp" />
-    <ClCompile Include="PropCompare.cpp" />
-    <ClCompile Include="PropCompareBinary.cpp" />
-    <ClCompile Include="PropCompareFolder.cpp" />
-    <ClCompile Include="PropCompareImage.cpp" />
-    <ClCompile Include="PropDirColors.cpp" />
-    <ClCompile Include="PropEditor.cpp" />
-    <ClCompile Include="Common\PropertyPageHost.cpp" />
-    <ClCompile Include="PropGeneral.cpp" />
-    <ClCompile Include="PropMarkerColors.cpp" />
-    <ClCompile Include="PropRegistry.cpp" />
-    <ClCompile Include="PropShell.cpp" />
-    <ClCompile Include="PropSyntaxColors.cpp" />
-    <ClCompile Include="PropTextColors.cpp" />
-    <ClCompile Include="Common\RegKey.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\RegOptionsMgr.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="SaveClosingDlg.cpp" />
-    <ClCompile Include="Common\scbarcf.cpp" />
-    <ClCompile Include="Common\scbarg.cpp" />
-    <ClCompile Include="SelectUnpackerDlg.cpp" />
-    <ClCompile Include="SharedFilterDlg.cpp" />
-    <ClCompile Include="Common\ShellContextMenu.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\ShellFileOperations.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\sizecbar.cpp" />
-    <ClCompile Include="Common\SortHeaderCtrl.cpp" />
-    <ClCompile Include="Common\SplitterWndEx.cpp" />
-    <ClCompile Include="StdAfx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="stringdiffs.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\SuperComboBox.cpp" />
-    <ClCompile Include="SubstitutionList.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="TempFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Test.cpp" />
-    <ClCompile Include="TestFilterDlg.cpp" />
-    <ClCompile Include="Common\unicoder.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\UnicodeString.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\UniFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp" />
-    <ClCompile Include="TrDialogs.cpp" />
-    <ClCompile Include="UniMarkdownFile.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\varprop.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="Common\VersionInfo.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="WildcardDropList.cpp" />
-    <ClCompile Include="WindowsManagerDialog.cpp" />
-    <ClCompile Include="WMGotoDlg.cpp" />
-    <ClCompile Include="diffutils\src\analyze.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\lib\cmpbuf.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\context.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\Diff.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ed.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\GnuVersion.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\ifdef.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\io.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\normal.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\side.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\util.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="diffutils\src\mystat.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteComparator.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\ByteCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="xdiff_gnudiff_compat.cpp">
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Externals\boost\boost\config.hpp" />
-    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp" />
-    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderer.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\hqbitmap.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cregexp.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cs2cs.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\filesup.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\fpattern.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\icu.hpp" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\memcombo.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\registry.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\string_util.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\utils\wcwidth.h" />
-    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="..\Externals\xdiff\xdiff.h" />
-    <ClInclude Include="..\Externals\xdiff\xdiffi.h" />
-    <ClInclude Include="..\Externals\xdiff\xemit.h" />
-    <ClInclude Include="..\Externals\xdiff\xinclude.h" />
-    <ClInclude Include="..\Externals\xdiff\xmacros.h" />
-    <ClInclude Include="..\Externals\xdiff\xprepare.h" />
-    <ClInclude Include="..\Externals\xdiff\xtypes.h" />
-    <ClInclude Include="..\Externals\xdiff\xutils.h" />
-    <ClInclude Include="..\Version.h" />
-    <ClInclude Include="7zCommon.h" />
-    <ClInclude Include="AboutDlg.h" />
-    <ClInclude Include="CompareEngines\ImageCompare.h" />
-    <ClInclude Include="Concurrent.h" />
-    <ClInclude Include="Common\BCMenu.h" />
-    <ClInclude Include="Common\Bitmap.h" />
-    <ClInclude Include="charsets.h" />
-    <ClInclude Include="DirSelectFilesDlg.h" />
-    <ClInclude Include="SubstitutionFiltersList.h" />
-    <ClInclude Include="MergeFrameCommon.h" />
-    <ClInclude Include="MergeEditFrm.h" />
-    <ClInclude Include="Common\ClipBoard.h" />
-    <ClInclude Include="Common\CMoveConstraint.h" />
-    <ClInclude Include="codepage_detect.h" />
-    <ClInclude Include="Common\ColorButton.h" />
-    <ClInclude Include="Common\ExConverter.h" />
-    <ClInclude Include="CompareEngines\BinaryCompare.h" />
-    <ClInclude Include="CompareOptions.h" />
-    <ClInclude Include="CompareStatisticsDlg.h" />
-    <ClInclude Include="CompareStats.h" />
-    <ClInclude Include="ConfigLog.h" />
-    <ClInclude Include="ConfirmFolderCopyDlg.h" />
-    <ClInclude Include="ConflictFileParser.h" />
-    <ClInclude Include="Common\coretools.h" />
-    <ClInclude Include="Constants.h" />
-    <ClInclude Include="DirActions.h" />
-    <ClInclude Include="HexMergeView.h" />
-    <ClInclude Include="DropHandler.h" />
-    <ClInclude Include="IMergeDoc.h" />
-    <ClInclude Include="ImgMergeFrm.h" />
-    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />
-    <ClInclude Include="Merge7zFormatRegister.h" />
-    <ClInclude Include="Merge7zFormatShellImpl.h" />
-    <ClInclude Include="MergeEditSplitterView.h" />
-    <ClInclude Include="MergeStatusBar.h" />
-    <ClInclude Include="OpenTableDlg.h" />
-    <ClInclude Include="OptionsCustomColors.h" />
-    <ClInclude Include="Diff3.h" />
-    <ClInclude Include="DiffContext.h" />
-    <ClInclude Include="DiffFileData.h" />
-    <ClInclude Include="DiffFileInfo.h" />
-    <ClInclude Include="DiffItem.h" />
-    <ClInclude Include="DiffItemList.h" />
-    <ClInclude Include="DiffList.h" />
-    <ClInclude Include="DiffTextBuffer.h" />
-    <ClInclude Include="DiffThread.h" />
-    <ClInclude Include="DiffViewBar.h" />
-    <ClInclude Include="DiffWrapper.h" />
-    <ClInclude Include="DirCmpReport.h" />
-    <ClInclude Include="DirCmpReportDlg.h" />
-    <ClInclude Include="DirColsDlg.h" />
-    <ClInclude Include="DirCompProgressBar.h" />
-    <ClInclude Include="DirDoc.h" />
-    <ClInclude Include="DirFrame.h" />
-    <ClInclude Include="DirItem.h" />
-    <ClInclude Include="DirReportTypes.h" />
-    <ClInclude Include="DirScan.h" />
-    <ClInclude Include="DirTravel.h" />
-    <ClInclude Include="DirView.h" />
-    <ClInclude Include="DirViewColItems.h" />
-    <ClInclude Include="dllpstub.h" />
-    <ClInclude Include="EditorFilepathBar.h" />
-    <ClInclude Include="EncodingErrorBar.h" />
-    <ClInclude Include="Environment.h" />
-    <ClInclude Include="Exceptions.h" />
-    <ClInclude Include="FileActionScript.h" />
-    <ClInclude Include="FileFilter.h" />
-    <ClInclude Include="FileFilterHelper.h" />
-    <ClInclude Include="FileFilterMgr.h" />
-    <ClInclude Include="FileFiltersDlg.h" />
-    <ClInclude Include="FileLocation.h" />
-    <ClInclude Include="FileOrFolderSelect.h" />
-    <ClInclude Include="FilepathEdit.h" />
-    <ClInclude Include="files.h" />
-    <ClInclude Include="FileTextEncoding.h" />
-    <ClInclude Include="FileTextStats.h" />
-    <ClInclude Include="FileTransform.h" />
-    <ClInclude Include="FileVersion.h" />
-    <ClInclude Include="FilterList.h" />
-    <ClInclude Include="FolderCmp.h" />
-    <ClInclude Include="GhostTextBuffer.h" />
-    <ClInclude Include="GhostTextView.h" />
-    <ClInclude Include="HexMergeDoc.h" />
-    <ClInclude Include="HexMergeFrm.h" />
-    <ClInclude Include="heksedit.h" />
-    <ClInclude Include="IAbortable.h" />
-    <ClInclude Include="IListCtrlImpl.h" />
-    <ClInclude Include="IntToIntMap.h" />
-    <ClInclude Include="IOptionsPanel.h" />
-    <ClInclude Include="Common\LanguageSelect.h" />
-    <ClInclude Include="JumpList.h" />
-    <ClInclude Include="LineFiltersDlg.h" />
-    <ClInclude Include="SubstitutionFiltersDlg.h" />
-    <ClInclude Include="LineFiltersList.h" />
-    <ClInclude Include="SubstitutionList.h" />
-    <ClInclude Include="LoadSaveCodepageDlg.h" />
-    <ClInclude Include="locality.h" />
-    <ClInclude Include="LocationBar.h" />
-    <ClInclude Include="LocationView.h" />
-    <ClInclude Include="Common\lwdisp.h" />
-    <ClInclude Include="MainFrm.h" />
-    <ClInclude Include="markdown.h" />
-    <ClInclude Include="Common\MDITabBar.h" />
-    <ClInclude Include="Common\memdc.h" />
-    <ClInclude Include="Merge.h" />
-    <ClInclude Include="MergeApp.h" />
-    <ClInclude Include="MergeCmdLineInfo.h" />
-    <ClInclude Include="MergeDoc.h" />
-    <ClInclude Include="MergeEditStatus.h" />
-    <ClInclude Include="MergeEditView.h" />
-    <ClInclude Include="MergeLineFlags.h" />
-    <ClInclude Include="Common\MessageBoxDialog.h" />
-    <ClInclude Include="MovedLines.h" />
-    <ClInclude Include="Common\multiformatText.h" />
-    <ClInclude Include="OpenDoc.h" />
-    <ClInclude Include="OpenFrm.h" />
-    <ClInclude Include="OpenView.h" />
-    <ClInclude Include="OptionsDef.h" />
-    <ClInclude Include="common\OptionsMgr.h" />
-    <ClInclude Include="OptionsDiffColors.h" />
-    <ClInclude Include="OptionsDiffOptions.h" />
-    <ClInclude Include="OptionsDirColors.h" />
+    <ClCompile Include="PropMergeColors.cpp" />\r
+    <ClCompile Include="PropCompare.cpp" />\r
+    <ClCompile Include="PropCompareBinary.cpp" />\r
+    <ClCompile Include="PropCompareFolder.cpp" />\r
+    <ClCompile Include="PropCompareImage.cpp" />\r
+    <ClCompile Include="PropDirColors.cpp" />\r
+    <ClCompile Include="PropEditor.cpp" />\r
+    <ClCompile Include="Common\PropertyPageHost.cpp" />\r
+    <ClCompile Include="PropGeneral.cpp" />\r
+    <ClCompile Include="PropMarkerColors.cpp" />\r
+    <ClCompile Include="PropRegistry.cpp" />\r
+    <ClCompile Include="PropShell.cpp" />\r
+    <ClCompile Include="PropSyntaxColors.cpp" />\r
+    <ClCompile Include="PropTextColors.cpp" />\r
+    <ClCompile Include="Common\RegKey.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\RegOptionsMgr.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="SaveClosingDlg.cpp" />\r
+    <ClCompile Include="Common\scbarcf.cpp" />\r
+    <ClCompile Include="Common\scbarg.cpp" />\r
+    <ClCompile Include="SelectUnpackerDlg.cpp" />\r
+    <ClCompile Include="SharedFilterDlg.cpp" />\r
+    <ClCompile Include="Common\ShellContextMenu.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\ShellFileOperations.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\sizecbar.cpp" />\r
+    <ClCompile Include="Common\SortHeaderCtrl.cpp" />\r
+    <ClCompile Include="Common\SplitterWndEx.cpp" />\r
+    <ClCompile Include="StdAfx.cpp">\r
+      <PrecompiledHeader>Create</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="stringdiffs.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\SuperComboBox.cpp" />\r
+    <ClCompile Include="SubstitutionList.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="TempFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Test.cpp" />\r
+    <ClCompile Include="TestFilterDlg.cpp" />\r
+    <ClCompile Include="Common\unicoder.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UnicodeString.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\UniFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp" />\r
+    <ClCompile Include="TrDialogs.cpp" />\r
+    <ClCompile Include="UniMarkdownFile.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\varprop.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\VersionInfo.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="WildcardDropList.cpp" />\r
+    <ClCompile Include="WindowsManagerDialog.cpp" />\r
+    <ClCompile Include="WMGotoDlg.cpp" />\r
+    <ClCompile Include="diffutils\src\analyze.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\lib\cmpbuf.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\context.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\Diff.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ed.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\GnuVersion.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\ifdef.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\io.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\normal.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\side.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\util.c">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="diffutils\src\mystat.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteComparator.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\ByteCompare.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="CompareEngines\TimeSizeCompare.cpp">\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+    <ClCompile Include="xdiff_gnudiff_compat.cpp">\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\Externals\boost\boost\config.hpp" />\r
+    <ClInclude Include="..\Externals\boost\boost\config\compiler\visualc.hpp" />\r
+    <ClInclude Include="..\Externals\boost\boost\config\select_compiler_config.hpp" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaleditview.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderer.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrendererdirectwrite.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\renderers\ccrystalrenderergdi.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextview.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ceditreplacedlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\cfindtextdlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\chcondlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\hqbitmap.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cregexp.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaleditviewex.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystalparser.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystaltextblock.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\cs2cs.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\ctextmarkerdlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editcmd.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\editreg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\edtlib.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\filesup.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\fpattern.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\gotodlg.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\icu.hpp" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\LineInfo.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\crystallineparser.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\dialogs\memcombo.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\registry.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\string_util.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\SyntaxColors.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\utils\wcwidth.h" />\r
+    <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest-printers.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\xdiff\xdiff.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xdiffi.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xemit.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xinclude.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xmacros.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xprepare.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xtypes.h" />\r
+    <ClInclude Include="..\Externals\xdiff\xutils.h" />\r
+    <ClInclude Include="..\Version.h" />\r
+    <ClInclude Include="7zCommon.h" />\r
+    <ClInclude Include="AboutDlg.h" />\r
+    <ClInclude Include="CompareEngines\ImageCompare.h" />\r
+    <ClInclude Include="Concurrent.h" />\r
+    <ClInclude Include="Common\BCMenu.h" />\r
+    <ClInclude Include="Common\Bitmap.h" />\r
+    <ClInclude Include="charsets.h" />\r
+    <ClInclude Include="DirSelectFilesDlg.h" />\r
+    <ClInclude Include="SubstitutionFiltersList.h" />\r
+    <ClInclude Include="MergeFrameCommon.h" />\r
+    <ClInclude Include="MergeEditFrm.h" />\r
+    <ClInclude Include="Common\ClipBoard.h" />\r
+    <ClInclude Include="Common\CMoveConstraint.h" />\r
+    <ClInclude Include="codepage_detect.h" />\r
+    <ClInclude Include="Common\ColorButton.h" />\r
+    <ClInclude Include="Common\ExConverter.h" />\r
+    <ClInclude Include="CompareEngines\BinaryCompare.h" />\r
+    <ClInclude Include="CompareOptions.h" />\r
+    <ClInclude Include="CompareStatisticsDlg.h" />\r
+    <ClInclude Include="CompareStats.h" />\r
+    <ClInclude Include="ConfigLog.h" />\r
+    <ClInclude Include="ConfirmFolderCopyDlg.h" />\r
+    <ClInclude Include="ConflictFileParser.h" />\r
+    <ClInclude Include="Common\coretools.h" />\r
+    <ClInclude Include="Constants.h" />\r
+    <ClInclude Include="DirActions.h" />\r
+    <ClInclude Include="HexMergeView.h" />\r
+    <ClInclude Include="DropHandler.h" />\r
+    <ClInclude Include="IMergeDoc.h" />\r
+    <ClInclude Include="ImgMergeFrm.h" />\r
+    <ClInclude Include="Merge7zFormatMergePluginImpl.h" />\r
+    <ClInclude Include="Merge7zFormatRegister.h" />\r
+    <ClInclude Include="Merge7zFormatShellImpl.h" />\r
+    <ClInclude Include="MergeEditSplitterView.h" />\r
+    <ClInclude Include="MergeStatusBar.h" />\r
+    <ClInclude Include="OpenTableDlg.h" />\r
+    <ClInclude Include="OptionsCustomColors.h" />\r
+    <ClInclude Include="Diff3.h" />\r
+    <ClInclude Include="DiffContext.h" />\r
+    <ClInclude Include="DiffFileData.h" />\r
+    <ClInclude Include="DiffFileInfo.h" />\r
+    <ClInclude Include="DiffItem.h" />\r
+    <ClInclude Include="DiffItemList.h" />\r
+    <ClInclude Include="DiffList.h" />\r
+    <ClInclude Include="DiffTextBuffer.h" />\r
+    <ClInclude Include="DiffThread.h" />\r
+    <ClInclude Include="DiffViewBar.h" />\r
+    <ClInclude Include="DiffWrapper.h" />\r
+    <ClInclude Include="DirCmpReport.h" />\r
+    <ClInclude Include="DirCmpReportDlg.h" />\r
+    <ClInclude Include="DirColsDlg.h" />\r
+    <ClInclude Include="DirCompProgressBar.h" />\r
+    <ClInclude Include="DirDoc.h" />\r
+    <ClInclude Include="DirFrame.h" />\r
+    <ClInclude Include="DirItem.h" />\r
+    <ClInclude Include="DirReportTypes.h" />\r
+    <ClInclude Include="DirScan.h" />\r
+    <ClInclude Include="DirTravel.h" />\r
+    <ClInclude Include="DirView.h" />\r
+    <ClInclude Include="DirViewColItems.h" />\r
+    <ClInclude Include="dllpstub.h" />\r
+    <ClInclude Include="EditorFilepathBar.h" />\r
+    <ClInclude Include="EncodingErrorBar.h" />\r
+    <ClInclude Include="Environment.h" />\r
+    <ClInclude Include="Exceptions.h" />\r
+    <ClInclude Include="FileActionScript.h" />\r
+    <ClInclude Include="FileFilter.h" />\r
+    <ClInclude Include="FileFilterHelper.h" />\r
+    <ClInclude Include="FileFilterMgr.h" />\r
+    <ClInclude Include="FileFiltersDlg.h" />\r
+    <ClInclude Include="FileLocation.h" />\r
+    <ClInclude Include="FileOrFolderSelect.h" />\r
+    <ClInclude Include="FilepathEdit.h" />\r
+    <ClInclude Include="files.h" />\r
+    <ClInclude Include="FileTextEncoding.h" />\r
+    <ClInclude Include="FileTextStats.h" />\r
+    <ClInclude Include="FileTransform.h" />\r
+    <ClInclude Include="FileVersion.h" />\r
+    <ClInclude Include="FilterList.h" />\r
+    <ClInclude Include="FolderCmp.h" />\r
+    <ClInclude Include="GhostTextBuffer.h" />\r
+    <ClInclude Include="GhostTextView.h" />\r
+    <ClInclude Include="HexMergeDoc.h" />\r
+    <ClInclude Include="HexMergeFrm.h" />\r
+    <ClInclude Include="heksedit.h" />\r
+    <ClInclude Include="IAbortable.h" />\r
+    <ClInclude Include="IListCtrlImpl.h" />\r
+    <ClInclude Include="IntToIntMap.h" />\r
+    <ClInclude Include="IOptionsPanel.h" />\r
+    <ClInclude Include="Common\LanguageSelect.h" />\r
+    <ClInclude Include="JumpList.h" />\r
+    <ClInclude Include="LineFiltersDlg.h" />\r
+    <ClInclude Include="SubstitutionFiltersDlg.h" />\r
+    <ClInclude Include="LineFiltersList.h" />\r
+    <ClInclude Include="SubstitutionList.h" />\r
+    <ClInclude Include="LoadSaveCodepageDlg.h" />\r
+    <ClInclude Include="locality.h" />\r
+    <ClInclude Include="LocationBar.h" />\r
+    <ClInclude Include="LocationView.h" />\r
+    <ClInclude Include="Common\lwdisp.h" />\r
+    <ClInclude Include="MainFrm.h" />\r
+    <ClInclude Include="markdown.h" />\r
+    <ClInclude Include="Common\MDITabBar.h" />\r
+    <ClInclude Include="Common\memdc.h" />\r
+    <ClInclude Include="Merge.h" />\r
+    <ClInclude Include="MergeApp.h" />\r
+    <ClInclude Include="MergeCmdLineInfo.h" />\r
+    <ClInclude Include="MergeDoc.h" />\r
+    <ClInclude Include="MergeEditStatus.h" />\r
+    <ClInclude Include="MergeEditView.h" />\r
+    <ClInclude Include="MergeLineFlags.h" />\r
+    <ClInclude Include="Common\MessageBoxDialog.h" />\r
+    <ClInclude Include="MovedLines.h" />\r
+    <ClInclude Include="Common\multiformatText.h" />\r
+    <ClInclude Include="OpenDoc.h" />\r
+    <ClInclude Include="OpenFrm.h" />\r
+    <ClInclude Include="OpenView.h" />\r
+    <ClInclude Include="OptionsDef.h" />\r
+    <ClInclude Include="common\OptionsMgr.h" />\r
+    <ClInclude Include="OptionsDiffColors.h" />\r
+    <ClInclude Include="OptionsDiffOptions.h" />\r
+    <ClInclude Include="OptionsDirColors.h" />\r
      <ClInclude Include="OptionsEditorSyntax.h" />\r
-    <ClInclude Include="OptionsFont.h" />
-    <ClInclude Include="OptionsInit.h" />
-    <ClInclude Include="OptionsPanel.h" />
-    <ClInclude Include="OptionsSyntaxColors.h" />
-    <ClInclude Include="PatchDlg.h" />
-    <ClInclude Include="PatchHTML.h" />
-    <ClInclude Include="PatchTool.h" />
-    <ClInclude Include="PathContext.h" />
-    <ClInclude Include="paths.h" />
-    <ClInclude Include="Common\PidlContainer.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="PluginManager.h" />
-    <ClInclude Include="Plugins.h" />
-    <ClInclude Include="PluginsListDlg.h" />
-    <ClInclude Include="Common\PreferencesDlg.h" />
-    <ClInclude Include="ProjectFile.h" />
-    <ClInclude Include="PropArchive.h" />
-    <ClInclude Include="PropBackups.h" />
-    <ClInclude Include="PropCodepage.h" />
-    <ClInclude Include="PropColorSchemes.h" />
-    <ClInclude Include="PropCompareTable.h" />
+    <ClInclude Include="OptionsFont.h" />\r
+    <ClInclude Include="OptionsInit.h" />\r
+    <ClInclude Include="OptionsPanel.h" />\r
+    <ClInclude Include="OptionsSyntaxColors.h" />\r
+    <ClInclude Include="PatchDlg.h" />\r
+    <ClInclude Include="PatchHTML.h" />\r
+    <ClInclude Include="PatchTool.h" />\r
+    <ClInclude Include="PathContext.h" />\r
+    <ClInclude Include="paths.h" />\r
+    <ClInclude Include="Common\PidlContainer.h" />\r
+    <ClInclude Include="pch.h" />\r
+    <ClInclude Include="PluginManager.h" />\r
+    <ClInclude Include="Plugins.h" />\r
+    <ClInclude Include="PluginsListDlg.h" />\r
+    <ClInclude Include="Common\PreferencesDlg.h" />\r
+    <ClInclude Include="ProjectFile.h" />\r
+    <ClInclude Include="PropArchive.h" />\r
+    <ClInclude Include="PropBackups.h" />\r
+    <ClInclude Include="PropCodepage.h" />\r
+    <ClInclude Include="PropColorSchemes.h" />\r
+    <ClInclude Include="PropCompareTable.h" />\r
      <ClInclude Include="PropEditorSyntax.h" />\r
-    <ClInclude Include="PropMergeColors.h" />
-    <ClInclude Include="PropCompare.h" />
-    <ClInclude Include="PropCompareBinary.h" />
-    <ClInclude Include="PropCompareFolder.h" />
-    <ClInclude Include="PropCompareImage.h" />
-    <ClInclude Include="PropDirColors.h" />
-    <ClInclude Include="PropEditor.h" />
-    <ClInclude Include="Common\PropertyPageHost.h" />
-    <ClInclude Include="PropGeneral.h" />
-    <ClInclude Include="PropMarkerColors.h" />
-    <ClInclude Include="PropRegistry.h" />
-    <ClInclude Include="PropShell.h" />
-    <ClInclude Include="PropSyntaxColors.h" />
-    <ClInclude Include="PropTextColors.h" />
-    <ClInclude Include="Common\RegKey.h" />
-    <ClInclude Include="Common\RegOptionsMgr.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="SaveClosingDlg.h" />
-    <ClInclude Include="Common\scbarcf.h" />
-    <ClInclude Include="Common\scbarg.h" />
-    <ClInclude Include="SelectUnpackerDlg.h" />
-    <ClInclude Include="SharedFilterDlg.h" />
-    <ClInclude Include="Common\ShellContextMenu.h" />
-    <ClInclude Include="Common\ShellFileOperations.h" />
-    <ClInclude Include="Common\sizecbar.h" />
-    <ClInclude Include="Common\SortHeaderCtrl.h" />
-    <ClInclude Include="Common\SplitterWndEx.h" />
-    <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="stringdiffs.h" />
-    <ClInclude Include="stringdiffsi.h" />
-    <ClInclude Include="Common\SuperComboBox.h" />
-    <ClInclude Include="TempFile.h" />
-    <ClInclude Include="TestMain.h" />
-    <ClInclude Include="TestFilterDlg.h" />
-    <ClInclude Include="Common\unicoder.h" />
-    <ClInclude Include="Common\UnicodeString.h" />
-    <ClInclude Include="Common\UniFile.h" />
-    <ClInclude Include="TrDialogs.h" />
-    <ClInclude Include="UniMarkdownFile.h" />
-    <ClInclude Include="Common\varprop.h" />
-    <ClInclude Include="Common\VersionInfo.h" />
-    <ClInclude Include="WildcardDropList.h" />
-    <ClInclude Include="WindowsManagerDialog.h" />
-    <ClInclude Include="Win_VersionHelper.h" />
-    <ClInclude Include="WMGotoDlg.h" />
-    <ClInclude Include="diffutils\lib\cmpbuf.h" />
-    <ClInclude Include="diffutils\config.h" />
-    <ClInclude Include="diffutils\src\diff.h" />
-    <ClInclude Include="diffutils\src\system.h" />
-    <ClInclude Include="CompareEngines\ByteComparator.h" />
-    <ClInclude Include="CompareEngines\ByteCompare.h" />
-    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h" />
-    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />
-    <ClInclude Include="xdiff_gnudiff_compat.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\binarydiff.ico" />
-    <None Include="res\both.bmp" />
-    <None Include="res\equalbinary.ico" />
-    <None Include="res\equalfile.ico" />
-    <None Include="res\error.ico" />
-    <None Include="res\fileskip.ico" />
-    <None Include="res\folder.ico" />
-    <None Include="res\folderskip.ico" />
-    <None Include="res\folderup.ico" />
-    <None Include="res\folderup_disable.ico" />
-    <None Include="res\hand.cur" />
-    <None Include="res\left.bmp" />
-    <None Include="res\left_to_browse.bmp" />
-    <None Include="res\left_to_right.bmp" />
-    <None Include="res\lfile.ico" />
-    <None Include="res\lfolder.ico" />
-    <None Include="res\Merge.ico" />
-    <None Include="res\Merge.rc2" />
-    <None Include="res\MergeDir.ico" />
-    <None Include="res\MergeDoc.ico" />
-    <None Include="res\MergeProject.ico" />
-    <None Include="res\mg_cur.cur" />
-    <None Include="res\move_left_to_browse.bmp" />
-    <None Include="res\move_right_to_browse.bmp" />
-    <None Include="res\notequalfile.ico" />
-    <None Include="res\rfile.ico" />
-    <None Include="res\rfolder.ico" />
-    <None Include="res\right.bmp" />
-    <None Include="res\right_to_browse.bmp" />
-    <None Include="res\right_to_left.bmp" />
-    <None Include="res\sigma.ico" />
-    <None Include="CHANGELO" />
-    <None Include="..\Docs\Users\ChangeLog.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Merge.rc" />
-    <ResourceCompile Include="Merge2.rc">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ResourceCompile>
-  </ItemGroup>
-  <Target Name="CopyVisualElements" AfterTargets="Build">
-    <ItemGroup>
-      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />
-      <LogoImages Include="res\LogoImages\*.png" />
-    </ItemGroup>
-    <Message Text="Copy visual elements to $(OutDir)" />
-    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />
-    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />
-  </Target>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="Merge.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
+    <ClInclude Include="PropMergeColors.h" />\r
+    <ClInclude Include="PropCompare.h" />\r
+    <ClInclude Include="PropCompareBinary.h" />\r
+    <ClInclude Include="PropCompareFolder.h" />\r
+    <ClInclude Include="PropCompareImage.h" />\r
+    <ClInclude Include="PropDirColors.h" />\r
+    <ClInclude Include="PropEditor.h" />\r
+    <ClInclude Include="Common\PropertyPageHost.h" />\r
+    <ClInclude Include="PropGeneral.h" />\r
+    <ClInclude Include="PropMarkerColors.h" />\r
+    <ClInclude Include="PropRegistry.h" />\r
+    <ClInclude Include="PropShell.h" />\r
+    <ClInclude Include="PropSyntaxColors.h" />\r
+    <ClInclude Include="PropTextColors.h" />\r
+    <ClInclude Include="Common\RegKey.h" />\r
+    <ClInclude Include="Common\RegOptionsMgr.h" />\r
+    <ClInclude Include="Resource.h" />\r
+    <ClInclude Include="SaveClosingDlg.h" />\r
+    <ClInclude Include="Common\scbarcf.h" />\r
+    <ClInclude Include="Common\scbarg.h" />\r
+    <ClInclude Include="SelectUnpackerDlg.h" />\r
+    <ClInclude Include="SharedFilterDlg.h" />\r
+    <ClInclude Include="Common\ShellContextMenu.h" />\r
+    <ClInclude Include="Common\ShellFileOperations.h" />\r
+    <ClInclude Include="Common\sizecbar.h" />\r
+    <ClInclude Include="Common\SortHeaderCtrl.h" />\r
+    <ClInclude Include="Common\SplitterWndEx.h" />\r
+    <ClInclude Include="StdAfx.h" />\r
+    <ClInclude Include="stringdiffs.h" />\r
+    <ClInclude Include="stringdiffsi.h" />\r
+    <ClInclude Include="Common\SuperComboBox.h" />\r
+    <ClInclude Include="TempFile.h" />\r
+    <ClInclude Include="TestMain.h" />\r
+    <ClInclude Include="TestFilterDlg.h" />\r
+    <ClInclude Include="Common\unicoder.h" />\r
+    <ClInclude Include="Common\UnicodeString.h" />\r
+    <ClInclude Include="Common\UniFile.h" />\r
+    <ClInclude Include="TrDialogs.h" />\r
+    <ClInclude Include="UniMarkdownFile.h" />\r
+    <ClInclude Include="Common\varprop.h" />\r
+    <ClInclude Include="Common\VersionInfo.h" />\r
+    <ClInclude Include="WildcardDropList.h" />\r
+    <ClInclude Include="WindowsManagerDialog.h" />\r
+    <ClInclude Include="Win_VersionHelper.h" />\r
+    <ClInclude Include="WMGotoDlg.h" />\r
+    <ClInclude Include="diffutils\lib\cmpbuf.h" />\r
+    <ClInclude Include="diffutils\config.h" />\r
+    <ClInclude Include="diffutils\src\diff.h" />\r
+    <ClInclude Include="diffutils\src\system.h" />\r
+    <ClInclude Include="CompareEngines\ByteComparator.h" />\r
+    <ClInclude Include="CompareEngines\ByteCompare.h" />\r
+    <ClInclude Include="CompareEngines\Wrap_DiffUtils.h" />\r
+    <ClInclude Include="CompareEngines\TimeSizeCompare.h" />\r
+    <ClInclude Include="xdiff_gnudiff_compat.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="res\binarydiff.ico" />\r
+    <None Include="res\both.bmp" />\r
+    <None Include="res\equalbinary.ico" />\r
+    <None Include="res\equalfile.ico" />\r
+    <None Include="res\error.ico" />\r
+    <None Include="res\fileskip.ico" />\r
+    <None Include="res\folder.ico" />\r
+    <None Include="res\folderskip.ico" />\r
+    <None Include="res\folderup.ico" />\r
+    <None Include="res\folderup_disable.ico" />\r
+    <None Include="res\hand.cur" />\r
+    <None Include="res\left.bmp" />\r
+    <None Include="res\left_to_browse.bmp" />\r
+    <None Include="res\left_to_right.bmp" />\r
+    <None Include="res\lfile.ico" />\r
+    <None Include="res\lfolder.ico" />\r
+    <None Include="res\Merge.ico" />\r
+    <None Include="res\Merge.rc2" />\r
+    <None Include="res\MergeDir.ico" />\r
+    <None Include="res\MergeDoc.ico" />\r
+    <None Include="res\MergeProject.ico" />\r
+    <None Include="res\mg_cur.cur" />\r
+    <None Include="res\move_left_to_browse.bmp" />\r
+    <None Include="res\move_right_to_browse.bmp" />\r
+    <None Include="res\notequalfile.ico" />\r
+    <None Include="res\rfile.ico" />\r
+    <None Include="res\rfolder.ico" />\r
+    <None Include="res\right.bmp" />\r
+    <None Include="res\right_to_browse.bmp" />\r
+    <None Include="res\right_to_left.bmp" />\r
+    <None Include="res\sigma.ico" />\r
+    <None Include="CHANGELO" />\r
+    <None Include="..\Docs\Users\ChangeLog.txt" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="Merge.rc" />\r
+    <ResourceCompile Include="Merge2.rc">\r
+      <ExcludedFromBuild>true</ExcludedFromBuild>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
+  <Target Name="CopyVisualElements" AfterTargets="Build">\r
+    <ItemGroup>\r
+      <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />\r
+      <LogoImages Include="res\LogoImages\*.png" />\r
+    </ItemGroup>\r
+    <Message Text="Copy visual elements to $(OutDir)" />\r
+    <Copy SourceFiles="@(VisualElementsManifest)" DestinationFolder="$(OutDir)" ContinueOnError="true" />\r
+    <Copy SourceFiles="@(LogoImages)" DestinationFolder="$(OutDir)\LogoImages" ContinueOnError="true" />\r
+  </Target>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties RESOURCE_FILE="Merge.rc" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
+\ No newline at end of file
diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp

index e8e116e..46d0e83 100644 (file)
--- a/Src/MergeCmdLineInfo.cpp
+++ b/Src/MergeCmdLineInfo.cpp
@@ -123,6 +123,7 @@ MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *q):
         m_bShowUsage(false),
         m_bNoPrefs(false),
         m_nCodepage(0),
+       m_bSelfCompare(false),
         m_dwLeftFlags(FFILEOPEN_NONE),
         m_dwMiddleFlags(FFILEOPEN_NONE),
         m_dwRightFlags(FFILEOPEN_NONE)
@@ -286,6 +287,11 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(const TCHAR *q)
                         // -noprefs means do not load or remember options (preferences)
                         m_bNoPrefs = true;
                 }
+               else if (param == _T("self-compare"))
+               {
+                       // -self-compare means compare a specified file with a copy of the file
+                       m_bSelfCompare = true;
+               }
                 else if (param == _T("minimize"))
                 {
                         // -minimize means minimize the main window.
diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h

index 96eef59..7d54398 100644 (file)
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -63,6 +63,7 @@ public:
         bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
         int  m_nCodepage;  /**< Codepage. */
         bool m_bNoPrefs; /**< Do not load or remember options (preferences) */   
+       bool m_bSelfCompare; /**< Compares the specified file with a copy of the file */
  
         unsigned m_dwLeftFlags; /**< Left side file's behavior options. */
         unsigned m_dwMiddleFlags; /**< Middle side file's behavior options. */
diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp

index 530f53f..8930dc5 100644 (file)
--- a/Src/OpenView.cpp
+++ b/Src/OpenView.cpp
@@ -212,7 +212,7 @@ void COpenView::OnInitialUpdate()
         m_dwFlags[2] = pDoc->m_dwFlags[2];
  
         m_ctlPath[0].SetFileControlStates();
-       m_ctlPath[1].SetFileControlStates();
+       m_ctlPath[1].SetFileControlStates(true);
         m_ctlPath[2].SetFileControlStates(true);
  
         for (int file = 0; file < m_files.GetSize(); file++)
@@ -550,7 +550,7 @@ void COpenView::OnOK()
         int nFiles = 0;
         for (auto& strPath: m_strPath)
         {
-               if (nFiles == 2 && strPath.empty())
+               if (nFiles >= 1 && strPath.empty())
                         break;
                 m_files.SetSize(nFiles + 1);
                 m_files[nFiles] = strPath;
@@ -561,8 +561,14 @@ void COpenView::OnOK()
         // If left path is a project-file, load it
         String ext;
         paths::SplitFilename(m_strPath[0], nullptr, nullptr, &ext);
-       if (m_strPath[1].empty() && strutils::compare_nocase(ext, ProjectFile::PROJECTFILE_EXT) == 0)
-               LoadProjectFile(m_strPath[0]);
+       if (nFiles == 1)
+       {
+               if (strutils::compare_nocase(ext, ProjectFile::PROJECTFILE_EXT) == 0)
+                       LoadProjectFile(m_strPath[0]);
+               else
+                       GetMainFrame()->DoSelfCompare(m_strPath[0], nullptr);
+               return;
+       }
  
         pathsType = paths::GetPairComparability(m_files, IsArchiveFile);
  
@@ -873,7 +879,12 @@ static UINT UpdateButtonStatesThread(LPVOID lpParam)
                                 else if (bInvalid[0])
                                         iStatusMsgId = IDS_OPEN_LEFTINVALID;
                                 else if (bInvalid[1])
-                                       iStatusMsgId = IDS_OPEN_RIGHTINVALID2;
+                               {
+                                       if (pathType[0] == paths::IS_EXISTING_FILE && (paths.GetSize() == 1 || paths[1].empty()))
+                                               iStatusMsgId = IDS_OPEN_FILESDIRS;
+                                       else
+                                               iStatusMsgId = IDS_OPEN_RIGHTINVALID2;
+                               }
                                 else if (!bInvalid[0] && !bInvalid[1])
                                 {
                                         if (pathType[0] != pathType[1])
diff --git a/Src/OptionsDiffColors.cpp b/Src/OptionsDiffColors.cpp

index 45c9991..41a6a0a 100644 (file)
--- a/Src/OptionsDiffColors.cpp
+++ b/Src/OptionsDiffColors.cpp
@@ -7,9 +7,29 @@
  #include "OptionsDiffColors.h"
  #include "OptionsDef.h"
  #include "OptionsMgr.h"
+#include <any>
  
  namespace Options { namespace DiffColors {
  
+const struct Map
+{
+       const String& name;
+       const int offset;
+       const std::any defValue;
+} map[] =
+{
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+       {OPT_CLR_DIFF, offsetof(COLORSETTINGS, clrDiff), RGB(239,203,5)},
+};
+
  void SetDefaults(COptionsMgr *pOptionsMgr)
  {
         pOptionsMgr->InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
diff --git a/Src/resource.h b/Src/resource.h

index 7a766b1..c2b20cb 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -658,6 +658,7 @@
  #define IDS_CONFLICT_BASE_FILE          16805\r
  #define IDS_CONFLICT_THEIRS_FILE        16806\r
  #define IDS_CONFLICT_MINE_FILE          16807\r
+#define IDS_SELFCOMPARE_ORIGINAL_FILE   16808\r
  #define IDS_LINE_STATUS_INFO_EOL        16832\r
  #define IDS_EMPTY_LINE_STATUS_INFO      16833\r
  #define IDS_LINE_STATUS_INFO            16834\r
diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html

index c43880f..7dad88d 100644 (file)
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
  </head>
  <body>
  <h1>Translations Status</h1>
-<p>Status from <strong>2021-02-22</strong>:</p>
+<p>Status from <strong>2021-02-28</strong>:</p>
  <h2>WinMerge</h2>
  <table class="status">
    <tr>
@@ -51,325 +51,325 @@
    </tr>
    <tr>
      <td class="left">Arabic</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">916</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">113</td>
+    <td class="right untranslated">114</td>
      <td class="right">89 %</td>
      <td class="center">2019-12-30</td>
    </tr>
    <tr>
      <td class="left">Basque</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">651</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">378</td>
+    <td class="right untranslated">379</td>
      <td class="right">63 %</td>
      <td class="center">2013-02-03</td>
    </tr>
    <tr>
      <td class="left">Brazilian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1025</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">5</td>
      <td class="right">100 %</td>
      <td class="center">2021-02-14</td>
    </tr>
    <tr>
      <td class="left">Bulgarian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">957</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">72</td>
+    <td class="right untranslated">73</td>
      <td class="right">93 %</td>
      <td class="center">2021-02-11</td>
    </tr>
    <tr>
      <td class="left">Catalan</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">575</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">454</td>
+    <td class="right untranslated">455</td>
      <td class="right">56 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">ChineseSimplified</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">989</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">40</td>
+    <td class="right untranslated">41</td>
      <td class="right">96 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">ChineseTraditional</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">869</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">160</td>
+    <td class="right untranslated">161</td>
      <td class="right">84 %</td>
      <td class="center">2010-02-19</td>
    </tr>
    <tr>
      <td class="left">Croatian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">642</td>
      <td class="right fuzzy">1</td>
-    <td class="right untranslated">386</td>
+    <td class="right untranslated">387</td>
      <td class="right">62 %</td>
      <td class="center">2009-02-13</td>
    </tr>
    <tr>
      <td class="left">Czech</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">613</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">416</td>
+    <td class="right untranslated">417</td>
      <td class="right">60 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Danish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">651</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">378</td>
+    <td class="right untranslated">379</td>
      <td class="right">63 %</td>
      <td class="center">2013-01-13</td>
    </tr>
    <tr>
      <td class="left">Dutch</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1022</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">7</td>
+    <td class="right untranslated">8</td>
      <td class="right">99 %</td>
      <td class="center">2018-09-06</td>
    </tr>
    <tr>
      <td class="left">English</td>
-    <td class="right">1029</td>
-    <td class="right translated">1029</td>
+    <td class="right">1030</td>
+    <td class="right translated">1030</td>
      <td class="right fuzzy">0</td>
      <td class="right untranslated">0</td>
      <td class="right">100 %</td>
-    <td class="center">2021-02-22</td>
+    <td class="center">2021-02-28</td>
    </tr>
    <tr>
      <td class="left">Finnish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">916</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">113</td>
+    <td class="right untranslated">114</td>
      <td class="right">89 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">French</td>
-    <td class="right">1029</td>
-    <td class="right translated">1023</td>
+    <td class="right">1030</td>
+    <td class="right translated">1029</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">6</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">1</td>
+    <td class="right">100 %</td>
      <td class="center">2021-02-10</td>
    </tr>
    <tr>
      <td class="left">Galician</td>
-    <td class="right">1029</td>
-    <td class="right translated">1025</td>
+    <td class="right">1030</td>
+    <td class="right translated">1029</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">1</td>
      <td class="right">100 %</td>
-    <td class="center">2021-02-13</td>
+    <td class="center">2021-02-27</td>
    </tr>
    <tr>
      <td class="left">German</td>
-    <td class="right">1029</td>
-    <td class="right translated">1025</td>
+    <td class="right">1030</td>
+    <td class="right translated">1029</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">1</td>
      <td class="right">100 %</td>
-    <td class="center">2021-02-13</td>
+    <td class="center">2021-02-27</td>
    </tr>
    <tr>
      <td class="left">Greek</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">614</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">415</td>
+    <td class="right untranslated">416</td>
      <td class="right">60 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Hungarian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">547</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">482</td>
+    <td class="right untranslated">483</td>
      <td class="right">53 %</td>
      <td class="center">2011-01-24</td>
    </tr>
    <tr>
      <td class="left">Italian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">919</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">110</td>
+    <td class="right untranslated">111</td>
      <td class="right">89 %</td>
      <td class="center">2019-07-12</td>
    </tr>
    <tr>
      <td class="left">Japanese</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1025</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">5</td>
      <td class="right">100 %</td>
      <td class="center">2021-01-26</td>
    </tr>
    <tr>
      <td class="left">Korean</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">873</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">156</td>
+    <td class="right untranslated">157</td>
      <td class="right">85 %</td>
      <td class="center">2018-02-05</td>
    </tr>
    <tr>
      <td class="left">Lithuanian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1025</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">5</td>
      <td class="right">100 %</td>
      <td class="center">2021-02-15</td>
    </tr>
    <tr>
      <td class="left">Norwegian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">643</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">386</td>
+    <td class="right untranslated">387</td>
      <td class="right">62 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Persian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">654</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">375</td>
-    <td class="right">64 %</td>
+    <td class="right untranslated">376</td>
+    <td class="right">63 %</td>
      <td class="center">2013-08-15</td>
    </tr>
    <tr>
      <td class="left">Polish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1002</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">27</td>
+    <td class="right untranslated">28</td>
      <td class="right">97 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Portuguese</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">994</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">35</td>
+    <td class="right untranslated">36</td>
      <td class="right">97 %</td>
      <td class="center">2020-11-29</td>
    </tr>
    <tr>
      <td class="left">Romanian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">572</td>
      <td class="right fuzzy">44</td>
-    <td class="right untranslated">413</td>
+    <td class="right untranslated">414</td>
      <td class="right">60 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Russian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1017</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">12</td>
+    <td class="right untranslated">13</td>
      <td class="right">99 %</td>
      <td class="center">2021-01-31</td>
    </tr>
    <tr>
      <td class="left">Serbian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">642</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">387</td>
+    <td class="right untranslated">388</td>
      <td class="right">62 %</td>
      <td class="center"></td>
    </tr>
    <tr>
      <td class="left">Sinhala</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">572</td>
      <td class="right fuzzy">63</td>
-    <td class="right untranslated">394</td>
+    <td class="right untranslated">395</td>
      <td class="right">62 %</td>
      <td class="center">2010-12-12</td>
    </tr>
    <tr>
      <td class="left">Slovak</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">989</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">40</td>
+    <td class="right untranslated">41</td>
      <td class="right">96 %</td>
      <td class="center">2020-11-02</td>
    </tr>
    <tr>
      <td class="left">Slovenian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">1025</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">4</td>
+    <td class="right untranslated">5</td>
      <td class="right">100 %</td>
      <td class="center">2021-02-14</td>
    </tr>
    <tr>
      <td class="left">Spanish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">885</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">144</td>
+    <td class="right untranslated">145</td>
      <td class="right">86 %</td>
      <td class="center">2020-04-03</td>
    </tr>
    <tr>
      <td class="left">Swedish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">919</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">110</td>
+    <td class="right untranslated">111</td>
      <td class="right">89 %</td>
      <td class="center">2019-10-07</td>
    </tr>
    <tr>
      <td class="left">Turkish</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">985</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">44</td>
+    <td class="right untranslated">45</td>
      <td class="right">96 %</td>
      <td class="center">2020-09-08</td>
    </tr>
    <tr>
      <td class="left">Ukrainian</td>
-    <td class="right">1029</td>
+    <td class="right">1030</td>
      <td class="right translated">648</td>
      <td class="right fuzzy">0</td>
-    <td class="right untranslated">381</td>
+    <td class="right untranslated">382</td>
      <td class="right">63 %</td>
      <td class="center">2009-06-13</td>
    </tr>
diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md

index c376b0d..30900fe 100644 (file)
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,47 +1,47 @@
  # Translations Status
  
-Status from **2021-02-22**:
+Status from **2021-02-28**:
  
  ## WinMerge
  
  | Language             | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
  |:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
-| Arabic               |  1029 |        916 |     0 |          113 |     89 % |  2019-12-30 |
-| Basque               |  1029 |        651 |     0 |          378 |     63 % |  2013-02-03 |
-| Brazilian            |  1029 |       1025 |     0 |            4 |    100 % |  2021-02-14 |
-| Bulgarian            |  1029 |        957 |     0 |           72 |     93 % |  2021-02-11 |
-| Catalan              |  1029 |        575 |     0 |          454 |     56 % |             |
-| ChineseSimplified    |  1029 |        989 |     0 |           40 |     96 % |             |
-| ChineseTraditional   |  1029 |        869 |     0 |          160 |     84 % |  2010-02-19 |
-| Croatian             |  1029 |        642 |     1 |          386 |     62 % |  2009-02-13 |
-| Czech                |  1029 |        613 |     0 |          416 |     60 % |             |
-| Danish               |  1029 |        651 |     0 |          378 |     63 % |  2013-01-13 |
-| Dutch                |  1029 |       1022 |     0 |            7 |     99 % |  2018-09-06 |
-| English              |  1029 |       1029 |     0 |            0 |    100 % |  2021-02-22 |
-| Finnish              |  1029 |        916 |     0 |          113 |     89 % |             |
-| French               |  1029 |       1023 |     0 |            6 |     99 % |  2021-02-10 |
-| Galician             |  1029 |       1025 |     0 |            4 |    100 % |  2021-02-13 |
-| German               |  1029 |       1025 |     0 |            4 |    100 % |  2021-02-13 |
-| Greek                |  1029 |        614 |     0 |          415 |     60 % |             |
-| Hungarian            |  1029 |        547 |     0 |          482 |     53 % |  2011-01-24 |
-| Italian              |  1029 |        919 |     0 |          110 |     89 % |  2019-07-12 |
-| Japanese             |  1029 |       1025 |     0 |            4 |    100 % |  2021-01-26 |
-| Korean               |  1029 |        873 |     0 |          156 |     85 % |  2018-02-05 |
-| Lithuanian           |  1029 |       1025 |     0 |            4 |    100 % |  2021-02-15 |
-| Norwegian            |  1029 |        643 |     0 |          386 |     62 % |             |
-| Persian              |  1029 |        654 |     0 |          375 |     64 % |  2013-08-15 |
-| Polish               |  1029 |       1002 |     0 |           27 |     97 % |             |
-| Portuguese           |  1029 |        994 |     0 |           35 |     97 % |  2020-11-29 |
-| Romanian             |  1029 |        572 |    44 |          413 |     60 % |             |
-| Russian              |  1029 |       1017 |     0 |           12 |     99 % |  2021-01-31 |
-| Serbian              |  1029 |        642 |     0 |          387 |     62 % |             |
-| Sinhala              |  1029 |        572 |    63 |          394 |     62 % |  2010-12-12 |
-| Slovak               |  1029 |        989 |     0 |           40 |     96 % |  2020-11-02 |
-| Slovenian            |  1029 |       1025 |     0 |            4 |    100 % |  2021-02-14 |
-| Spanish              |  1029 |        885 |     0 |          144 |     86 % |  2020-04-03 |
-| Swedish              |  1029 |        919 |     0 |          110 |     89 % |  2019-10-07 |
-| Turkish              |  1029 |        985 |     0 |           44 |     96 % |  2020-09-08 |
-| Ukrainian            |  1029 |        648 |     0 |          381 |     63 % |  2009-06-13 |
+| Arabic               |  1030 |        916 |     0 |          114 |     89 % |  2019-12-30 |
+| Basque               |  1030 |        651 |     0 |          379 |     63 % |  2013-02-03 |
+| Brazilian            |  1030 |       1025 |     0 |            5 |    100 % |  2021-02-14 |
+| Bulgarian            |  1030 |        957 |     0 |           73 |     93 % |  2021-02-11 |
+| Catalan              |  1030 |        575 |     0 |          455 |     56 % |             |
+| ChineseSimplified    |  1030 |        989 |     0 |           41 |     96 % |             |
+| ChineseTraditional   |  1030 |        869 |     0 |          161 |     84 % |  2010-02-19 |
+| Croatian             |  1030 |        642 |     1 |          387 |     62 % |  2009-02-13 |
+| Czech                |  1030 |        613 |     0 |          417 |     60 % |             |
+| Danish               |  1030 |        651 |     0 |          379 |     63 % |  2013-01-13 |
+| Dutch                |  1030 |       1022 |     0 |            8 |     99 % |  2018-09-06 |
+| English              |  1030 |       1030 |     0 |            0 |    100 % |  2021-02-28 |
+| Finnish              |  1030 |        916 |     0 |          114 |     89 % |             |
+| French               |  1030 |       1029 |     0 |            1 |    100 % |  2021-02-10 |
+| Galician             |  1030 |       1029 |     0 |            1 |    100 % |  2021-02-27 |
+| German               |  1030 |       1029 |     0 |            1 |    100 % |  2021-02-27 |
+| Greek                |  1030 |        614 |     0 |          416 |     60 % |             |
+| Hungarian            |  1030 |        547 |     0 |          483 |     53 % |  2011-01-24 |
+| Italian              |  1030 |        919 |     0 |          111 |     89 % |  2019-07-12 |
+| Japanese             |  1030 |       1025 |     0 |            5 |    100 % |  2021-01-26 |
+| Korean               |  1030 |        873 |     0 |          157 |     85 % |  2018-02-05 |
+| Lithuanian           |  1030 |       1025 |     0 |            5 |    100 % |  2021-02-15 |
+| Norwegian            |  1030 |        643 |     0 |          387 |     62 % |             |
+| Persian              |  1030 |        654 |     0 |          376 |     63 % |  2013-08-15 |
+| Polish               |  1030 |       1002 |     0 |           28 |     97 % |             |
+| Portuguese           |  1030 |        994 |     0 |           36 |     97 % |  2020-11-29 |
+| Romanian             |  1030 |        572 |    44 |          414 |     60 % |             |
+| Russian              |  1030 |       1017 |     0 |           13 |     99 % |  2021-01-31 |
+| Serbian              |  1030 |        642 |     0 |          388 |     62 % |             |
+| Sinhala              |  1030 |        572 |    63 |          395 |     62 % |  2010-12-12 |
+| Slovak               |  1030 |        989 |     0 |           41 |     96 % |  2020-11-02 |
+| Slovenian            |  1030 |       1025 |     0 |            5 |    100 % |  2021-02-14 |
+| Spanish              |  1030 |        885 |     0 |          145 |     86 % |  2020-04-03 |
+| Swedish              |  1030 |        919 |     0 |          111 |     89 % |  2019-10-07 |
+| Turkish              |  1030 |        985 |     0 |           45 |     96 % |  2020-09-08 |
+| Ukrainian            |  1030 |        648 |     0 |          382 |     63 % |  2009-06-13 |
  
  ## ShellExtension
  
diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml

index dcff39d..434aa02 100644 (file)
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,16 +1,16 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <status>
-  <update>2021-02-22</update>
+  <update>2021-02-28</update>
    <translations project="WinMerge">
      <translation>
        <language>Arabic</language>
        <file>Arabic.po</file>
        <update>2019-12-30</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>916</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>113</untranslated>
+        <untranslated>114</untranslated>
        </strings>
      </translation>
      <translation>
@@ -18,10 +18,10 @@
        <file>Basque.po</file>
        <update>2013-02-03</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>651</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>378</untranslated>
+        <untranslated>379</untranslated>
        </strings>
        <translators>
          <translator>
@@ -35,10 +35,10 @@
        <file>Brazilian.po</file>
        <update>2021-02-14</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1025</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>5</untranslated>
        </strings>
        <translators>
          <translator>
@@ -60,10 +60,10 @@
        <file>Bulgarian.po</file>
        <update>2021-02-11</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>957</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>72</untranslated>
+        <untranslated>73</untranslated>
        </strings>
        <translators>
          <translator>
@@ -85,10 +85,10 @@
        <file>Catalan.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>575</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>454</untranslated>
+        <untranslated>455</untranslated>
        </strings>
        <translators>
          <translator>
@@ -102,10 +102,10 @@
        <file>ChineseSimplified.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>989</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>40</untranslated>
+        <untranslated>41</untranslated>
        </strings>
        <translators>
          <translator>
@@ -127,10 +127,10 @@
        <file>ChineseTraditional.po</file>
        <update>2010-02-19</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>869</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>160</untranslated>
+        <untranslated>161</untranslated>
        </strings>
        <translators>
          <translator>
@@ -152,10 +152,10 @@
        <file>Croatian.po</file>
        <update>2009-02-13</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>642</translated>
          <fuzzy>1</fuzzy>
-        <untranslated>386</untranslated>
+        <untranslated>387</untranslated>
        </strings>
        <translators>
          <translator>
@@ -169,10 +169,10 @@
        <file>Czech.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>613</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>416</untranslated>
+        <untranslated>417</untranslated>
        </strings>
        <translators>
          <translator>
@@ -190,10 +190,10 @@
        <file>Danish.po</file>
        <update>2013-01-13</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>651</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>378</untranslated>
+        <untranslated>379</untranslated>
        </strings>
        <translators>
          <translator>
@@ -211,10 +211,10 @@
        <file>Dutch.po</file>
        <update>2018-09-06</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1022</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>7</untranslated>
+        <untranslated>8</untranslated>
        </strings>
        <translators>
          <translator>
@@ -229,10 +229,10 @@
      <translation template="1">
        <language>English</language>
        <file>English.pot</file>
-      <update>2021-02-22</update>
+      <update>2021-02-28</update>
        <strings>
-        <count>1029</count>
-        <translated>1029</translated>
+        <count>1030</count>
+        <translated>1030</translated>
          <fuzzy>0</fuzzy>
          <untranslated>0</untranslated>
        </strings>
@@ -242,10 +242,10 @@
        <file>Finnish.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>916</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>113</untranslated>
+        <untranslated>114</untranslated>
        </strings>
      </translation>
      <translation>
@@ -253,10 +253,10 @@
        <file>French.po</file>
        <update>2021-02-10</update>
        <strings>
-        <count>1029</count>
-        <translated>1023</translated>
+        <count>1030</count>
+        <translated>1029</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>6</untranslated>
+        <untranslated>1</untranslated>
        </strings>
        <translators>
          <translator maintainer="1">
@@ -288,12 +288,12 @@
      <translation>
        <language>Galician</language>
        <file>Galician.po</file>
-      <update>2021-02-13</update>
+      <update>2021-02-27</update>
        <strings>
-        <count>1029</count>
-        <translated>1025</translated>
+        <count>1030</count>
+        <translated>1029</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>1</untranslated>
        </strings>
        <translators>
          <translator>
@@ -308,12 +308,12 @@
      <translation>
        <language>German</language>
        <file>German.po</file>
-      <update>2021-02-13</update>
+      <update>2021-02-27</update>
        <strings>
-        <count>1029</count>
-        <translated>1025</translated>
+        <count>1030</count>
+        <translated>1029</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>1</untranslated>
        </strings>
        <translators>
          <translator maintainer="1">
@@ -335,10 +335,10 @@
        <file>Greek.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>614</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>415</untranslated>
+        <untranslated>416</untranslated>
        </strings>
        <translators>
          <translator>
@@ -352,10 +352,10 @@
        <file>Hungarian.po</file>
        <update>2011-01-24</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>547</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>482</untranslated>
+        <untranslated>483</untranslated>
        </strings>
        <translators>
          <translator>
@@ -373,10 +373,10 @@
        <file>Italian.po</file>
        <update>2019-07-12</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>919</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>110</untranslated>
+        <untranslated>111</untranslated>
        </strings>
        <translators>
          <translator>
@@ -402,10 +402,10 @@
        <file>Japanese.po</file>
        <update>2021-01-26</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1025</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>5</untranslated>
        </strings>
        <translators>
          <translator>
@@ -419,10 +419,10 @@
        <file>Korean.po</file>
        <update>2018-02-05</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>873</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>156</untranslated>
+        <untranslated>157</untranslated>
        </strings>
        <translators>
          <translator>
@@ -448,10 +448,10 @@
        <file>Lithuanian.po</file>
        <update>2021-02-15</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1025</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>5</untranslated>
        </strings>
        <translators>
          <translator>
@@ -465,10 +465,10 @@
        <file>Norwegian.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>643</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>386</untranslated>
+        <untranslated>387</untranslated>
        </strings>
        <translators>
          <translator>
@@ -486,10 +486,10 @@
        <file>Persian.po</file>
        <update>2013-08-15</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>654</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>375</untranslated>
+        <untranslated>376</untranslated>
        </strings>
        <translators>
          <translator>
@@ -503,10 +503,10 @@
        <file>Polish.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1002</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>27</untranslated>
+        <untranslated>28</untranslated>
        </strings>
        <translators>
          <translator>
@@ -531,10 +531,10 @@
        <file>Portuguese.po</file>
        <update>2020-11-29</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>994</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>35</untranslated>
+        <untranslated>36</untranslated>
        </strings>
        <translators>
          <translator>
@@ -554,10 +554,10 @@
        <file>Romanian.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>572</translated>
          <fuzzy>44</fuzzy>
-        <untranslated>413</untranslated>
+        <untranslated>414</untranslated>
        </strings>
        <translators>
          <translator>
@@ -571,10 +571,10 @@
        <file>Russian.po</file>
        <update>2021-01-31</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1017</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>12</untranslated>
+        <untranslated>13</untranslated>
        </strings>
        <translators>
          <translator>
@@ -604,10 +604,10 @@
        <file>Serbian.po</file>
        <update></update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>642</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>387</untranslated>
+        <untranslated>388</untranslated>
        </strings>
        <translators>
          <translator>
@@ -621,10 +621,10 @@
        <file>Sinhala.po</file>
        <update>2010-12-12</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>572</translated>
          <fuzzy>63</fuzzy>
-        <untranslated>394</untranslated>
+        <untranslated>395</untranslated>
        </strings>
        <translators>
          <translator>
@@ -637,10 +637,10 @@
        <file>Slovak.po</file>
        <update>2020-11-02</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>989</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>40</untranslated>
+        <untranslated>41</untranslated>
        </strings>
        <translators>
          <translator>
@@ -662,10 +662,10 @@
        <file>Slovenian.po</file>
        <update>2021-02-14</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>1025</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>4</untranslated>
+        <untranslated>5</untranslated>
        </strings>
        <translators>
          <translator>
@@ -687,10 +687,10 @@
        <file>Spanish.po</file>
        <update>2020-04-03</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>885</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>144</untranslated>
+        <untranslated>145</untranslated>
        </strings>
        <translators>
          <translator>
@@ -716,10 +716,10 @@
        <file>Swedish.po</file>
        <update>2019-10-07</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>919</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>110</untranslated>
+        <untranslated>111</untranslated>
        </strings>
        <translators>
          <translator>
@@ -741,10 +741,10 @@
        <file>Turkish.po</file>
        <update>2020-09-08</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>985</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>44</untranslated>
+        <untranslated>45</untranslated>
        </strings>
        <translators>
          <translator>
@@ -766,10 +766,10 @@
        <file>Ukrainian.po</file>
        <update>2009-06-13</update>
        <strings>
-        <count>1029</count>
+        <count>1030</count>
          <translated>648</translated>
          <fuzzy>0</fuzzy>
-        <untranslated>381</untranslated>
+        <untranslated>382</untranslated>
        </strings>
        <translators>
          <translator>
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po

index 932f806..1401aa5 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -2238,6 +2238,9 @@ msgstr "ملفهم"
  msgid "Mine File"
  msgstr "ملفي"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po

index c62be76..92630dd 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2751,6 +2751,9 @@ msgstr "Theirs Agiria"
  msgid "Mine File"
  msgstr "Mine Agiria"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po

index aadd272..eca8cb3 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2785,6 +2785,9 @@ msgstr "O Arquivo Deles"
  msgid "Mine File"
  msgstr "Meu Arquivo"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Lin: %s  Col: %d/%d  Car: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po

index be9c589..1f3c82f 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2253,6 +2253,9 @@ msgstr "Техен файл"
  msgid "Mine File"
  msgstr "Мой файл"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ред: %s  колона: %d/%d  знак: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po

index a791f70..eee601c 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2714,6 +2714,9 @@ msgstr ""
  msgid "Mine File"
  msgstr ""
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po

index 51ae83d..3b7f3d5 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2250,6 +2250,9 @@ msgstr "他们的文件"
  msgid "Mine File"
  msgstr "我的文件"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "行: %s  列: %d/%d  字符: %d/%d  换行符: %s"
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po

index 9e3782d..129cd95 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2762,6 +2762,9 @@ msgstr "他們的(檔案)"
  msgid "Mine File"
  msgstr "我的(檔案)"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po

index c17680a..7518363 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2750,6 +2750,9 @@ msgstr "Tuđe datoteke"
  msgid "Mine File"
  msgstr "Moje datoteke"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po

index ebe8236..969ce20 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2717,6 +2717,9 @@ msgstr ""
  msgid "Mine File"
  msgstr ""
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po

index 57264fb..71f4ce3 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2766,6 +2766,9 @@ msgstr "Deres fil"
  msgid "Mine File"
  msgstr "Min fil"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po

index b4bf977..30fff66 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2256,6 +2256,9 @@ msgstr "Hun bestand"
  msgid "Mine File"
  msgstr "Mijn bestand"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Regel: %s  Kolom: %d/%d  Teken: %d/%d  Regeleinde: %s"
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot

index 971c85c..0a97fa7 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: WinMerge\n"
  "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-02-22 08:38+0000\n"
+"POT-Creation-Date: 2021-02-28 11:53+0000\n"
  "PO-Revision-Date: \n"
  "Last-Translator: \n"
  "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2111,6 +2111,9 @@ msgstr ""
  msgid "Mine File"
  msgstr ""
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po

index 5160171..2110660 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2777,6 +2777,9 @@ msgstr "Niiden tiedosto"
  msgid "Mine File"
  msgstr "Minun tiedosto"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po

index 7e2ff45..e53b2be 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2793,6 +2793,9 @@ msgstr "Leurs fichiers"
  msgid "Mine File"
  msgstr "Mes fichiers"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po

index d8affa9..f0e42cd 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2786,6 +2786,9 @@ msgstr "Arquivo Theirs"
  msgid "Mine File"
  msgstr "Arquivo Mine"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Lñ: %s  Col: %d/%d  Car: %d/%d  EOL: %s"
@@ -4365,3 +4368,4 @@ msgstr "Permitir executar só unha instancia"
  
  msgid "Allow only one instance to run and wait for the instance to terminate"
  msgstr "Permitir só a execución dunha instancia e esperar a que a instancia remate"
+
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po

index 1b81b13..235fc1c 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2673,6 +2673,9 @@ msgstr "Deren Datei"
  msgid "Mine File"
  msgstr "Meine Datei"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Zeile: %s  Spalte: %d/%d  Zeichen: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po

index c9bf1b6..629de84 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2744,6 +2744,9 @@ msgstr "Αρχείο Αυτών"
  msgid "Mine File"
  msgstr "Αρχείο Δικό μου"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po

index 97a2a72..365b1b5 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2694,6 +2694,9 @@ msgstr ""
  msgid "Mine File"
  msgstr ""
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po

index 5eb66e5..c08006d 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2241,6 +2241,9 @@ msgstr "Loro file"
  msgid "Mine File"
  msgstr "Mio file"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Car: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po

index f621f07..21682af 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2232,6 +2232,9 @@ msgstr "Theirs File"
  msgid "Mine File"
  msgstr "Mine File"
  
+msgid "Original File"
+msgstr "元のファイル"
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "行: %s  列: %d/%d  文字: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po

index ba3a827..7321e83 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2776,6 +2776,9 @@ msgstr "그 파일"
  msgid "Mine File"
  msgstr "내 파일"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "줄: %s  열: %d/%d  문자: %d/%d  줄끝: %s"
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po

index e679581..18b761c 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2120,6 +2120,9 @@ msgstr "Jų failas"
  msgid "Mine File"
  msgstr "Mano failas"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Eil.: %s  Stlp.: %d/%d  Sk.: %d/%d  EPF: %s"
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po

index 76f74db..52e0da6 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2750,6 +2750,9 @@ msgstr "Deres fil"
  msgid "Mine File"
  msgstr "Min fil"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po

index 225a542..0be0ab6 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2769,6 +2769,9 @@ msgstr " پرونده ديگران "
  msgid "Mine File"
  msgstr " پرونده خودم "
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po

index e865f73..a2bce20 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2117,6 +2117,9 @@ msgstr "Ich plik"
  msgid "Mine File"
  msgstr "Mój plik"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Wier: %s  Kol: %d/%d  Zn: %d/%d  ZKL: %s"
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po

index 268f1d3..94ada26 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2265,6 +2265,9 @@ msgstr "O ficheiro deles"
  msgid "Mine File"
  msgstr "O meu ficheiro"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po

index e651030..1a437a3 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2745,6 +2745,9 @@ msgstr "Fişierul lor"
  msgid "Mine File"
  msgstr "Fişierul meu"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po

index 19ad61f..499bb45 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2119,6 +2119,9 @@ msgstr "Их файл"
  msgid "Mine File"
  msgstr "Мой файл"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Стр: %s  Стб: %d/%d  Симв: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po

index 638d07a..7819963 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2733,6 +2733,9 @@ msgstr "Њихове датотеке"
  msgid "Mine File"
  msgstr "Моје датотеке"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po

index 15abdcc..743a819 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -2742,6 +2742,9 @@ msgstr "ඔවුන්ගේම ලිපිගොනු"
  msgid "Mine File"
  msgstr "ලිපිගොනු ආකරය"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po

index a99360d..8c69ddd 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2255,6 +2255,9 @@ msgstr "Ich súbor"
  msgid "Mine File"
  msgstr "Môj súbor"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Riad: %s  Stĺ: %d/%d  Zn: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po

index 89dfafa..1864906 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2781,6 +2781,9 @@ msgstr "Njihova datoteka"
  msgid "Mine File"
  msgstr "Vaša datoteka"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Vr: %s  St: %d/%d  Zn: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po

index e2175a0..7ebcb7f 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2249,6 +2249,9 @@ msgstr "Archivo externo"
  msgid "Mine File"
  msgstr "Archivo interno"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po

index 08d172a..d6190a7 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2773,6 +2773,9 @@ msgstr "Deras fil"
  msgid "Mine File"
  msgstr "Min fil"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po

index e635870..dc08552 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2242,6 +2242,9 @@ msgstr "Başkalarının Dosyası"
  msgid "Mine File"
  msgstr "Benim Dosyam"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr "Satır: %s  Sütun: %d/%d  Karakter: %d/%d  Satır Sonu: %s"
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po

index 6753293..6586279 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2751,6 +2751,9 @@ msgstr "Їхй файл"
  msgid "Mine File"
  msgstr "Мій файл"
  
+msgid "Original File"
+msgstr ""
+
  #, c-format
  msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
  msgstr ""
author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 28 Feb 2021 09:52:47 +0000 (18:52 +0900)
Docs/Manual/EN/Command_line.xml		patch \| blob \| history
Docs/Manual/JP/Command_line.xml		patch \| blob \| history
Src/MainFrm.cpp		patch \| blob \| history
Src/MainFrm.h		patch \| blob \| history
Src/Merge.cpp		patch \| blob \| history
Src/Merge.rc		patch \| blob \| history
Src/Merge.vcxproj		patch \| blob \| history
Src/MergeCmdLineInfo.cpp		patch \| blob \| history
Src/MergeCmdLineInfo.h		patch \| blob \| history
Src/OpenView.cpp		patch \| blob \| history
Src/OptionsDiffColors.cpp		patch \| blob \| history
Src/resource.h		patch \| blob \| history
Translations/TranslationsStatus.html		patch \| blob \| history
Translations/TranslationsStatus.md		patch \| blob \| history
Translations/TranslationsStatus.xml		patch \| blob \| history
Translations/WinMerge/Arabic.po		patch \| blob \| history
Translations/WinMerge/Basque.po		patch \| blob \| history
Translations/WinMerge/Brazilian.po		patch \| blob \| history
Translations/WinMerge/Bulgarian.po		patch \| blob \| history
Translations/WinMerge/Catalan.po		patch \| blob \| history
Translations/WinMerge/ChineseSimplified.po		patch \| blob \| history
Translations/WinMerge/ChineseTraditional.po		patch \| blob \| history
Translations/WinMerge/Croatian.po		patch \| blob \| history
Translations/WinMerge/Czech.po		patch \| blob \| history
Translations/WinMerge/Danish.po		patch \| blob \| history
Translations/WinMerge/Dutch.po		patch \| blob \| history
Translations/WinMerge/English.pot		patch \| blob \| history
Translations/WinMerge/Finnish.po		patch \| blob \| history
Translations/WinMerge/French.po		patch \| blob \| history
Translations/WinMerge/Galician.po		patch \| blob \| history
Translations/WinMerge/German.po		patch \| blob \| history
Translations/WinMerge/Greek.po		patch \| blob \| history
Translations/WinMerge/Hungarian.po		patch \| blob \| history
Translations/WinMerge/Italian.po		patch \| blob \| history
Translations/WinMerge/Japanese.po		patch \| blob \| history
Translations/WinMerge/Korean.po		patch \| blob \| history
Translations/WinMerge/Lithuanian.po		patch \| blob \| history
Translations/WinMerge/Norwegian.po		patch \| blob \| history
Translations/WinMerge/Persian.po		patch \| blob \| history
Translations/WinMerge/Polish.po		patch \| blob \| history
Translations/WinMerge/Portuguese.po		patch \| blob \| history
Translations/WinMerge/Romanian.po		patch \| blob \| history
Translations/WinMerge/Russian.po		patch \| blob \| history
Translations/WinMerge/Serbian.po		patch \| blob \| history
Translations/WinMerge/Sinhala.po		patch \| blob \| history
Translations/WinMerge/Slovak.po		patch \| blob \| history
Translations/WinMerge/Slovenian.po		patch \| blob \| history
Translations/WinMerge/Spanish.po		patch \| blob \| history
Translations/WinMerge/Swedish.po		patch \| blob \| history
Translations/WinMerge/Turkish.po		patch \| blob \| history
Translations/WinMerge/Ukrainian.po		patch \| blob \| history