SourceGear DiffMerge : Version 4.2.0 (697:52f98c4fcb) [x64] stable : WXMSW {3.0.0} [B stable][P windows.x64][V 04.02.00.00697] Machine: ll=8 l=4 i=4 v*=8 s=8 c=2 Compiled features: FEATURE_SHEX FEATURE_BATCHOUTPUT Command Line Arguments: [0]: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe Active Window Properties: Window Title: DiffFile2.txt, DiffFile1.txt - SourceGear DiffMerge Window Type: FileDiff Edit State: Editable DisplayOps[View]: 0x00000000 DisplayOps[Edit]: 0x00000000 Pilcrow: false TabStop: 8 LineNumbers: true Files Loaded: Panel(Left): Path: C:\Users\sourcegear\Documents\DiffFile2.txt EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] Panel(Right/View): Path: C:\Users\sourcegear\Documents\DiffFile1.txt EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] Panel(Right/Edit): Path: C:\Users\sourcegear\AppData\Local\Temp\___F65E.tmp EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] RuleSet: _Default_ Analysis Reference View: DisplayOps: 0x00000000 Analysis Stats: Changes: 2 Alignment Marks: [count 1] Analysis Editing View: DisplayOps: 0x00000000 Analysis Stats: Changes: 2 Alignment Marks: [count 1] Ruleset Table: [Version 7] Ruleset: _Default_ Suffixes: * Line Match Handling: [0x0000001c] Ignore/Strip EOLs: true Ignore/Fold Case: false Strip Whitespace: false Also Treat TABs as Whitespace: N/A Folder Diff Ruleset Equivalence: [0x00000018] Ignore/Strip EOLs: true Ignore/Fold Case: false Strip Whitespace: true Also Treat TABs as Whitespace: true Default Context Guidelines: [0x0000000a] Classify Differences as Important: true EOL differences are important: N/A Case differences are important: true Whitespace differences are important: false Treat TABs as Whitespace: false Custom Contexts: [0 contexts] Character Encoding: Automatically detect Unicode BOM: true Fallback Handling: Assume [Western European (ISO-8859-1), Default encoding] Lines To Omit: [0 patterns] Ruleset: Python Source Suffixes: py Line Match Handling: [0x00000010] Ignore/Strip EOLs: true Ignore/Fold Case: true Strip Whitespace: true Also Treat TABs as Whitespace: true Folder Diff Ruleset Equivalence: [0x00000018] Ignore/Strip EOLs: true Ignore/Fold Case: false Strip Whitespace: true Also Treat TABs as Whitespace: true Default Context Guidelines: [0x0000000c] Classify Differences as Important: true EOL differences are important: N/A Case differences are important: true Whitespace differences are important: true Treat TABs as Whitespace: N/A Custom Contexts: [2 contexts] Context[0]: Comment: # to EOL Guidelines: [0x00000011] Classify Differences as Important: false EOL differences are important: N/A Case differences are important: N/A Whitespace differences are important: N/A Treat TABs as Whitespace: N/A Context[1]: Literal: " to " Guidelines: [0x0000000e] Classify Differences as Important: true EOL differences are important: N/A Case differences are important: true Whitespace differences are important: true Treat TABs as Whitespace: N/A Character Encoding: Automatically detect Unicode BOM: true Fallback Handling: Assume [Western European (ISO-8859-1)] Lines To Omit: [0 patterns] Ruleset: Java Source Suffixes: java jav Line Match Handling: [0x00000010] Ignore/Strip EOLs: true Ignore/Fold Case: true Strip Whitespace: true Also Treat TABs as Whitespace: true Folder Diff Ruleset Equivalence: [0x00000018] Ignore/Strip EOLs: true Ignore/Fold Case: false Strip Whitespace: true Also Treat TABs as Whitespace: true Default Context Guidelines: [0x00000018] Classify Differences as Important: true EOL differences are important: N/A Case differences are important: true Whitespace differences are important: false Treat TABs as Whitespace: true Custom Contexts: [3 contexts] Context[0]: Comment: /\* to \*/ Guidelines: [0x00000011] Classify Differences as Important: false EOL differences are important: N/A Case differences are important: N/A Whitespace differences are important: N/A Treat TABs as Whitespace: N/A Context[1]: Comment: // to EOL (Escape character \) Guidelines: [0x00000011] Classify Differences as Important: false EOL differences are important: N/A Case differences are important: N/A Whitespace differences are important: N/A Treat TABs as Whitespace: N/A Context[2]: Literal: " to " or EOL (Escape character \) Guidelines: [0x0000000e] Classify Differences as Important: true EOL differences are important: N/A Case differences are important: true Whitespace differences are important: true Treat TABs as Whitespace: N/A Character Encoding: Automatically detect Unicode BOM: true Fallback Handling: Assume [Western European (ISO-8859-1)] Lines To Omit: [0 patterns] External Tools Table: [Version 1] Global Properties: (current / default) Folder/IgnoreSuffixFilter : 0 [0x00000000] / 0 [0x00000000] Folder/IgnoreSubdirFilter : 0 [0x00000000] / 0 [0x00000000] Folder/IgnoreFullFilenameFilter : 0 [0x00000000] / 0 [0x00000000] Folder/IgnorePatternCase : 1 [0x00000001] / 1 [0x00000001] Folder/IgnoreMatchupCase : 1 [0x00000001] / 1 [0x00000001] File/Ruleset/EnableCustomRulesets : 1 [0x00000001] / 1 [0x00000001] File/Ruleset/EnableAutomaticMatch : 1 [0x00000001] / 1 [0x00000001] File/Ruleset/IgnoreSuffixCase : 1 [0x00000001] / 1 [0x00000001] File/Ruleset/RequireCompleteMatch : 0 [0x00000000] / 0 [0x00000000] File/Ruleset/AskIfNoMatch : 0 [0x00000000] / 0 [0x00000000] File/View/DontShowEquivalentMsg : 0 [0x00000000] / 0 [0x00000000] File/View/DontShowAutoMergeConflictsMsg : 0 [0x00000000] / 0 [0x00000000] Folder/View/DontShowSameFolderMsg : 0 [0x00000000] / 0 [0x00000000] File/View/DontShowSameFilesMsg : 0 [0x00000000] / 0 [0x00000000] File/View/DontShowExitMultipleWindowsMsg : 1 [0x00000001] / 1 [0x00000001] Folder/ShowFlags : -1 [0xffffffff] / -1 [0xffffffff] Folder/ShowEqual : -1 [0xffffffff] / -1 [0xffffffff] Folder/ShowEquivalent : -1 [0xffffffff] / -1 [0xffffffff] Folder/ShowSingles : -1 [0xffffffff] / -1 [0xffffffff] Folder/ShowFolders : -1 [0xffffffff] / -1 [0xffffffff] Folder/ShowErrors : -1 [0xffffffff] / -1 [0xffffffff] File/Color/Window/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] File/Color/Omit/bg : 16316664 [0x00f8f8f8] / 16316664 [0x00f8f8f8] File/Color/Omit/fg : 8421504 [0x00808080] / 8421504 [0x00808080] File/Color/AllEqual/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] File/Color/AllEqual/fg : 0 [0x00000000] / 0 [0x00000000] File/Color/AllEqual/Unimp/fg : 0 [0x00000000] / 0 [0x00000000] File/Color/NoneEqual/bg : 16314608 [0x00f8f0f0] / 16314608 [0x00f8f0f0] File/Color/NoneEqual/IL/bg : 16765640 [0x00ffd2c8] / 16765640 [0x00ffd2c8] File/Color/NoneEqual/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000] File/Color/NoneEqual/Unimp/fg : 8866109 [0x0087493d] / 8866109 [0x0087493d] File/Color/Conflict/bg : 16777168 [0x00ffffd0] / 16777168 [0x00ffffd0] File/Color/Conflict/IL/bg : 16765640 [0x00ffd2c8] / 16765640 [0x00ffd2c8] File/Color/Conflict/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000] File/Color/Conflict/Unimp/fg : 8866109 [0x0087493d] / 8866109 [0x0087493d] File/Color/SubEqual/bg : 15792368 [0x00f0f8f0] / 15792368 [0x00f0f8f0] File/Color/SubEqual/IL/bg : 12647104 [0x00c0fac0] / 12647104 [0x00c0fac0] File/Color/SubEqual/fg : 32768 [0x00008000] / 32768 [0x00008000] File/Color/SubNotEqual/bg : 15921919 [0x00f2f2ff] / 15921919 [0x00f2f2ff] File/Color/SubNotEqual/IL/bg : 14408703 [0x00dbdbff] / 14408703 [0x00dbdbff] File/Color/SubNotEqual/fg : 128 [0x00000080] / 128 [0x00000080] File/Color/Sum/Unimp/fg : 6460808 [0x00629588] / 6460808 [0x00629588] File/Color/EolUnknown/fg : 12632256 [0x00c0c0c0] / 12632256 [0x00c0c0c0] File/Color/LineNr/fg : 6460808 [0x00629588] / 6460808 [0x00629588] File/Color/LineNr/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] File/Color/Caret/fg : 0 [0x00000000] / 0 [0x00000000] File/Color/Void/fg : 14540253 [0x00dddddd] / 14540253 [0x00dddddd] File/Color/Void/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] File/Color/Selection/fg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] File/Color/Selection/bg : 255 [0x000000ff] / 255 [0x000000ff] Folder/Color/Different/fg : 13762560 [0x00d20000] / 13762560 [0x00d20000] Folder/Color/Different/bg : 16314608 [0x00f8f0f0] / 16314608 [0x00f8f0f0] Folder/Color/Equal/fg : 0 [0x00000000] / 0 [0x00000000] Folder/Color/Equal/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] Folder/Color/Equivalent/fg : 8421504 [0x00808080] / 8421504 [0x00808080] Folder/Color/Equivalent/bg : 16316664 [0x00f8f8f8] / 16316664 [0x00f8f8f8] Folder/Color/Folders/fg : 0 [0x00000000] / 0 [0x00000000] Folder/Color/Folders/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] Folder/Color/Peerless/fg : 200 [0x000000c8] / 200 [0x000000c8] Folder/Color/Peerless/bg : 16777215 [0x00ffffff] / 16777215 [0x00ffffff] Folder/Color/Error/fg : 16711680 [0x00ff0000] / 16711680 [0x00ff0000] Folder/Color/Error/bg : 16777184 [0x00ffffe0] / 16777184 [0x00ffffe0] Window/Size/Blank/w : 1050 [0x0000041a] / -1 [0xffffffff] Window/Size/Blank/h : 685 [0x000002ad] / -1 [0xffffffff] Window/Size/Folder/w : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Folder/h : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Diff/w : 1050 [0x0000041a] / -1 [0xffffffff] Window/Size/Diff/h : 685 [0x000002ad] / -1 [0xffffffff] Window/Size/Merge/w : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Merge/h : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/PrintPreview/w : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/PrintPreview/h : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Blank/x : 220 [0x000000dc] / -1 [0xffffffff] Window/Size/Blank/y : 52 [0x00000034] / -1 [0xffffffff] Window/Size/Folder/x : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Folder/y : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Diff/x : 220 [0x000000dc] / -1 [0xffffffff] Window/Size/Diff/y : 52 [0x00000034] / -1 [0xffffffff] Window/Size/Merge/x : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Merge/y : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/PrintPreview/x : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/PrintPreview/y : -1 [0xffffffff] / -1 [0xffffffff] Window/Size/Blank/maximized : 0 [0x00000000] / 0 [0x00000000] Window/Size/Folder/maximized : 0 [0x00000000] / 0 [0x00000000] Window/Size/Diff/maximized : 0 [0x00000000] / 0 [0x00000000] Window/Size/Merge/maximized : 0 [0x00000000] / 0 [0x00000000] File/Context/Goal : 3 [0x00000003] / 3 [0x00000003] File/Context/IntraLineSmoothingThreshold : 3 [0x00000003] / 3 [0x00000003] File/Context/LineSmoothingThreshold : 0 [0x00000000] / 0 [0x00000000] File/Context/DetailLevel : 1 [0x00000001] / 1 [0x00000001] File/Context/MultiLineDetailLevel : 1 [0x00000001] / 1 [0x00000001] File/Context/MultiLineDetailLimit : 40 [0x00000028] / 40 [0x00000028] File/View/DisplayOp : 0 [0x00000000] / 0 [0x00000000] File/View/LineNumbers : 1 [0x00000001] / 1 [0x00000001] File/View/Pilcrow : 0 [0x00000000] / 0 [0x00000000] File/View/Tabstop : 8 [0x00000008] / 8 [0x00000008] File/View/Diff/ViewSplitterOrientation : 1 [0x00000001] / 1 [0x00000001] File/View/Diff/EditSplitterOrientation : 1 [0x00000001] / 1 [0x00000001] File/View/Merge/ViewSplitterOrientation : 1 [0x00000001] / 1 [0x00000001] File/View/Merge/EditSplitterOrientation : 1 [0x00000001] / 1 [0x00000001] Options/Dialog/InitialPage : 1 [0x00000001] / 0 [0x00000000] Ruleset/Dialog/InitialPage : 5 [0x00000005] / 0 [0x00000000] Dialog/Find/ICase : 1 [0x00000001] / 1 [0x00000001] Dialog/Find/Wrap : 0 [0x00000000] / 0 [0x00000000] Dialog/Find/RegEx : 0 [0x00000000] / 0 [0x00000000] Dialog/Find/DontShowEofMsg : 0 [0x00000000] / 0 [0x00000000] PageSetup/MarginTop : 10 [0x0000000a] / 10 [0x0000000a] PageSetup/MarginLeft : 10 [0x0000000a] / 10 [0x0000000a] PageSetup/MarginBottom : 10 [0x0000000a] / 10 [0x0000000a] PageSetup/MarginRight : 10 [0x0000000a] / 10 [0x0000000a] PrintData/Bin : 0 [0x00000000] / 0 [0x00000000] PrintData/Collate : 0 [0x00000000] / 0 [0x00000000] PrintData/Color : 1 [0x00000001] / 1 [0x00000001] PrintData/Duplex : 0 [0x00000000] / 0 [0x00000000] PrintData/Copies : 1 [0x00000001] / 1 [0x00000001] PrintData/Orientation : 1 [0x00000001] / 1 [0x00000001] PrintData/PaperId : 1 [0x00000001] / 1 [0x00000001] PrintData/Quality : -1 [0xffffffff] / -1 [0xffffffff] Misc/Print/Across : 1 [0x00000001] / 1 [0x00000001] Misc/RequireFinalEOL : 1 [0x00000001] / 1 [0x00000001] Misc/AutoSaveInterval : 100 [0x00000064] / 100 [0x00000064] Misc/CheckFilesOnActivate : 1 [0x00000001] / 1 [0x00000001] Misc/CheckFoldersOnActivate : 0 [0x00000000] / 0 [0x00000000] Misc/AutoAdvanceAfterApply : 1 [0x00000001] / 1 [0x00000001] ShellExtension/Enabled : 1 [0x00000001] / 1 [0x00000001] ExternalTools/IgnoreSuffixCase : 1 [0x00000001] / 1 [0x00000001] ExternalTools/EnableTools : 0 [0x00000000] / 0 [0x00000000] ExternalTools/RequireCompleteMatch : 0 [0x00000000] / 0 [0x00000000] ExternalTools/DontShowExecMsg : 0 [0x00000000] / 0 [0x00000000] ExternalTools/DlgInitialPage : 0 [0x00000000] / 0 [0x00000000] License/Check : 1469810047 [0x579b857f] / 0 [0x00000000] Revision/Check : 1469809940 [0x579b8514] / 0 [0x00000000] Folder/SoftMatch/Mode : 2 [0x00000002] / 2 [0x00000002] Folder/SoftMatch/SimpleIgnoreEOL : 1 [0x00000001] / 1 [0x00000001] Folder/SoftMatch/SimpleIgnoreWhitespace : 1 [0x00000001] / 1 [0x00000001] Folder/SoftMatch/SimpleIgnoreTAB : 1 [0x00000001] / 1 [0x00000001] Folder/SoftMatch/RulesetFileLimitMb : 1 [0x00000001] / 1 [0x00000001] Folder/SoftMatch/RulesetAllowDefault : 0 [0x00000000] / 0 [0x00000000] Folder/QuickMatch/Enabled : 0 [0x00000000] / 0 [0x00000000] Folder/SuffixFilter : cur: a aps bsc bz2 cab chm dll dmg exe exp id idb ilk iso lib map mdp msi ncb nvram o obj ocx out pch pdb res sbr so tar tgz vcp vmdk vmem vmsd vmss zip def: a aps bsc bz2 cab chm dll dmg exe exp id idb ilk iso lib map mdp msi ncb nvram o obj ocx out pch pdb res sbr so tar tgz vcp vmdk vmem vmsd vmss zip Folder/SubdirFilter : cur: Debug Release _sgbak _sgvault objs .svn .git .bzr .hg .sgdrawer .sgcloset def: Debug Release _sgbak _sgvault objs .svn .git .bzr .hg .sgdrawer .sgcloset Folder/FullFilenameFilter : cur: .DS_Store core *~ .#* def: .DS_Store core *~ .#* Dialog/Choose/Folder/Seed/Left : cur: def: Dialog/Choose/Folder/Seed/Right : cur: def: Dialog/Choose/File/Diff/Seed/0 : cur: C:\Users\sourcegear\Documents\DiffFile2.txt def: Dialog/Choose/File/Diff/Seed/1 : cur: C:\Users\sourcegear\Documents\DiffFile1.txt def: Dialog/Choose/File/Merge/Seed/0 : cur: def: Dialog/Choose/File/Merge/Seed/1 : cur: def: Dialog/Choose/File/Merge/Seed/2 : cur: def: Dialog/Choose/Folder/Seed/SaveAs : cur: def: Dialog/Choose/File/Diff/Seed/Export : cur: def: File/Font : cur: 10:: def: 10:: Folder/Font : cur: 10:: def: 10:: File/Printer/Font : cur: 10:: def: 10:: Folder/Printer/Font : cur: 10:: def: 10:: File/Ruleset/Serialized : cur: 004207024cffffffff0353090000005f44656661 756c745f0453010000002a054204064c01000000 174c00000000184c00000000154201124c0a0000 00134c1c000000164c18000000144cffffffff02 4c0000000003530d000000507974686f6e20536f 757263650453020000007079054203064c010000 00174c01000000184c010000001542010b4c0000 00000c4c110000000d5301000000230e53000000 000f4200104201114c000000000b4c010000000c 4c0e0000000d5301000000220e5301000000220f 4200104200114c01000000124c0c000000134c10 000000164c18000000144c00000000024c010000 0003530b0000004a61766120536f757263650453 080000006a617661206a6176054203064c010000 00174c01000000184c010000001542010b4c0000 00000c4c110000000d53030000002f5c2a0e5303 0000005c2a2f0f4200104200114c000000000b4c 010000000c4c110000000d53020000002f2f0e53 000000000f425c104201114c010000000b4c0200 00000c4c0e0000000d5301000000220e53010000 00220f425c104201114c02000000124c18000000 134c10000000164c18000000144c010000000142 07 def: Dialog/Color/CustomColors : cur: def: PrintData/PrinterName : cur: def: ShellExtension/CLARGS : cur: /nosplash /shex def: /nosplash /shex ExternalTools/Serialized : cur: 004201014201 def: License/Key : cur: DPF : cur: def: Folder/SoftMatch/SimpleSuffixes : cur: c cpp cs h bas frm cls vbp ctl vbs java jav txt def: c cpp cs h bas frm cls vbp ctl vbs java jav txt Folder/QuickMatch/Suffixes : cur: m4a m4p mov mp3 wav def: m4a m4p mov mp3 wav All Windows: Window Title: DiffFile2.txt, DiffFile1.txt - SourceGear DiffMerge Window Type: FileDiff Edit State: Editable DisplayOps[View]: 0x00000000 DisplayOps[Edit]: 0x00000000 Pilcrow: false TabStop: 8 LineNumbers: true Files Loaded: Panel(Left): Path: C:\Users\sourcegear\Documents\DiffFile2.txt EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] Panel(Right/View): Path: C:\Users\sourcegear\Documents\DiffFile1.txt EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] Panel(Right/Edit): Path: C:\Users\sourcegear\AppData\Local\Temp\___F65E.tmp EOL Style: CRLF Encoding: Western European (ISO-8859-1) (without BOM) Stats: [0x00000000] RuleSet: _Default_ Analysis Reference View: DisplayOps: 0x00000000 Analysis Stats: Changes: 2 Alignment Marks: [count 1] Analysis Editing View: DisplayOps: 0x00000000 Analysis Stats: Changes: 2 Alignment Marks: [count 1]