Bug: Merge Miscatergorizes conflict as removed

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 1
Joined: Mon May 25, 2015 4:24 pm
PostPosted: Mon May 25, 2015 4:40 pm
The latest version of diffmerge miscatogorized a change as a deletion rather than a conflict, which can result in loss of code.

If you open the attached git merge generated files, and scroll to the bottom, you can see that the last change in the remote version is treated as a deletion rather than grouped in as part of the previous conflict. If a developer simply resolves conflicts and trusts the difftool, this will result that change being lost.

Because of this, we can't trust diffmerge and have been forced to switch to another tool, which is unfortunate because it's an otherwise excellent tool.

I have confirmed that Beyond Compare and Apple FileMerge both handle this correctly.

Let me know if there's anything else I can do to help resolve this.

Here's the support information from the about dialog:

SourceGear DiffMerge : Version 4.2.0 (697:52f98c4fcb) [intel] stable : WXMAC {3.0.0}

[B stable][P mac.intel][V 04.02.00.00697]

Machine: ll=8 l=8 i=4 v*=8 s=8 c=4

Compiled features:
FEATURE_BATCHOUTPUT

Command Line Arguments:
[0]: /Volumes/DiffMerge 4.2.0.697 intel stable/DiffMerge.app/Contents/MacOS/DiffMerge

Active Window Properties:
Window Title: DownloadManager.js.LOCAL.61661.js, DownloadManager.js.BASE.61661.js, DownloadManager.js.REMOTE.61661.js - SourceGear DiffMerge
Window Type: FileMerge
Edit State: Editable
DisplayOps[View]: 0x00000000
DisplayOps[Edit]: 0x00000000
Pilcrow: false
TabStop: 2
LineNumbers: true
Files Loaded:
Panel(Left):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.LOCAL.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Center/View):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.BASE.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Center/Edit):
Path: /var/folders/mb/v22bbr7s7_9dxk40rdxf9fgw0000gn/T/___DownloadManager.js.BASENH3Afs
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Right):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.REMOTE.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
RuleSet: _Default_
Analysis Reference View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 9; Conflicts: 2
Alignment Marks: [count 1]
Analysis Editing View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 9; Conflicts: 2
Alignment Marks: [count 1]

Ruleset Table: [Version 7]
Ruleset: _Default_
Suffixes: *
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: [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
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Unknown encoding (41)]
Lines To Omit: [0 patterns]
Ruleset: C/C++/C# Source
Suffixes: c cpp cs h
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: [4 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
Context[3]: 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]
Ruleset: Visual Basic Source
Suffixes: bas frm cls vbp ctl vbs
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: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000010]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: false
Whitespace differences are important: false
Treat TABs as Whitespace: true
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: 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]
Ruleset: Text Files
Suffixes: txt text
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: [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
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Western European (ISO-8859-1)]
Lines To Omit: [0 patterns]
Ruleset: UTF-8 Text Files
Suffixes: utf utf8
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: [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
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Unknown encoding (41)]
Lines To Omit: [0 patterns]
Ruleset: XML Files
Suffixes: xml
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: [1 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
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Assume [Unknown encoding (41)]
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 : 16739961 [0x00ff6e79] / 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 : 1920 [0x00000780] / -1 [0xffffffff]
Window/Size/Blank/h : 1177 [0x00000499] / -1 [0xffffffff]
Window/Size/Folder/w : 1632 [0x00000660] / -1 [0xffffffff]
Window/Size/Folder/h : 994 [0x000003e2] / -1 [0xffffffff]
Window/Size/Diff/w : 840 [0x00000348] / -1 [0xffffffff]
Window/Size/Diff/h : 512 [0x00000200] / -1 [0xffffffff]
Window/Size/Merge/w : 1920 [0x00000780] / -1 [0xffffffff]
Window/Size/Merge/h : 1177 [0x00000499] / -1 [0xffffffff]
Window/Size/PrintPreview/w : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/h : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Blank/x : 0 [0x00000000] / -1 [0xffffffff]
Window/Size/Blank/y : 22 [0x00000016] / -1 [0xffffffff]
Window/Size/Folder/x : 36 [0x00000024] / -1 [0xffffffff]
Window/Size/Folder/y : 495 [0x000001ef] / -1 [0xffffffff]
Window/Size/Diff/x : 1976 [0x000007b8] / -1 [0xffffffff]
Window/Size/Diff/y : 146 [0x00000092] / -1 [0xffffffff]
Window/Size/Merge/x : 0 [0x00000000] / -1 [0xffffffff]
Window/Size/Merge/y : 22 [0x00000016] / -1 [0xffffffff]
Window/Size/PrintPreview/x : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/PrintPreview/y : -1 [0xffffffff] / -1 [0xffffffff]
Window/Size/Blank/maximized : 1 [0x00000001] / 0 [0x00000000]
Window/Size/Folder/maximized : 0 [0x00000000] / 0 [0x00000000]
Window/Size/Diff/maximized : 0 [0x00000000] / 0 [0x00000000]
Window/Size/Merge/maximized : 1 [0x00000001] / 0 [0x00000000]
File/Context/Goal : 3 [0x00000003] / 3 [0x00000003]
File/Context/IntraLineSmoothingThreshold : 1 [0x00000001] / 3 [0x00000003]
File/Context/LineSmoothingThreshold : 0 [0x00000000] / 0 [0x00000000]
File/Context/DetailLevel : 1 [0x00000001] / 1 [0x00000001]
File/Context/MultiLineDetailLevel : 2 [0x00000002] / 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 : 2 [0x00000002] / 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 : 11 [0x0000000b] / 0 [0x00000000]
Ruleset/Dialog/InitialPage : 1 [0x00000001] / 0 [0x00000000]
Dialog/Find/ICase : 1 [0x00000001] / 1 [0x00000001]
Dialog/Find/Wrap : 1 [0x00000001] / 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]
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 : 2 [0x00000002] / 0 [0x00000000]
License/Check : 0 [0x00000000] / 0 [0x00000000]
Revision/Check : 1432591026 [0x55639ab2] / 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: /Users/csmith/Workspace/archive/deployment/deploy
def:
Dialog/Choose/Folder/Seed/Right :
cur: /Users/csmith/Workspace/archive/test-harness/target/test-harness-10.1.0-SNAPSHOT/deploy
def:
Dialog/Choose/File/Diff/Seed/0 :
cur:
def:
Dialog/Choose/File/Diff/Seed/1 :
cur:
def:
Dialog/Choose/File/Merge/Seed/0 :
cur: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.LOCAL.61661.js
def:
Dialog/Choose/File/Merge/Seed/1 :
cur: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.BASE.61661.js
def:
Dialog/Choose/File/Merge/Seed/2 :
cur: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.REMOTE.61661.js
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
756c745f0453010000002a054203064c29000000
174c00000000184c00000000154201124c0e0000
00134c10000000164c18000000144cffffffff02
4c0000000003530f000000432f432b2b2f432320
536f7572636504530a0000006320637070206373
2068054203064c01000000174c00000000184c00
0000001542010b4c000000000c4c110000000d53
030000002f5c2a0e53030000005c2a2f0f420010
4200114c000000000b4c010000000c4c11000000
0d53020000002f2f0e53000000000f425c104201
114c010000000b4c020000000c4c0e0000000d53
01000000220e5301000000220f425c104201114c
020000000b4c030000000c4c0e0000000d530100
0000270e5301000000270f425c104201114c0300
0000124c18000000134c10000000164c18000000
144c00000000024c010000000353130000005669
7375616c20426173696320536f75726365045317
0000006261732066726d20636c73207662702063
746c20766273054203064c01000000174c000000
00184c000000001542010b4c000000000c4c1100
00000d5301000000270e53000000000f42001042
01114c000000000b4c010000000c4c0e0000000d
5301000000220e5301000000220f420010420011
4c01000000124c10000000134c10000000164c10
000000144c01000000024c0200000003530d0000
00507974686f6e20536f75726365045302000000
7079054203064c01000000174c00000000184c00
0000001542010b4c000000000c4c110000000d53
01000000230e53000000000f4200104201114c00
0000000b4c010000000c4c0e0000000d53010000
00220e5301000000220f4200104200114c010000
00124c0c000000134c10000000164c1800000014
4c02000000024c0300000003530b0000004a6176
6120536f757263650453080000006a617661206a
6176054203064c01000000174c00000000184c00
0000001542010b4c000000000c4c110000000d53
030000002f5c2a0e53030000005c2a2f0f420010
4200114c000000000b4c010000000c4c11000000
0d53020000002f2f0e53000000000f425c104201
114c010000000b4c020000000c4c0e0000000d53
01000000220e5301000000220f425c104201114c
02000000124c18000000134c10000000164c1800
0000144c03000000024c0400000003530a000000
546578742046696c657304530800000074787420
74657874054203064c01000000174c0000000018
4c00000000154201124c0e000000134c10000000
164c18000000144c04000000024c050000000353
100000005554462d3820546578742046696c6573
0453080000007574662075746638054203064c29
000000174c00000000184c00000000154201124c
0e000000134c10000000164c18000000144c0500
0000024c06000000035309000000584d4c204669
6c6573045303000000786d6c054203064c290000
00174c00000000184c000000001542010b4c0000
00000c4c110000000d53040000003c212d2d0e53
030000002d2d3e0f4200104200114c0000000012
4c18000000134c10000000164c18000000144c06
000000014207
def:
Dialog/Color/CustomColors :
cur: ::::::::::::::::
def:
PrintData/PrinterName :
cur:
def:
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: DownloadManager.js.LOCAL.61661.js, DownloadManager.js.BASE.61661.js, DownloadManager.js.REMOTE.61661.js - SourceGear DiffMerge
Window Type: FileMerge
Edit State: Editable
DisplayOps[View]: 0x00000000
DisplayOps[Edit]: 0x00000000
Pilcrow: false
TabStop: 2
LineNumbers: true
Files Loaded:
Panel(Left):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.LOCAL.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Center/View):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.BASE.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Center/Edit):
Path: /var/folders/mb/v22bbr7s7_9dxk40rdxf9fgw0000gn/T/___DownloadManager.js.BASENH3Afs
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
Panel(Right):
Path: /Users/csmith/Downloads/DownloadManager diff/DownloadManager.js.REMOTE.61661.js
EOL Style: LF
Encoding: Unknown encoding (41) (without BOM)
Stats: [0x00000000]
RuleSet: _Default_
Analysis Reference View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 9; Conflicts: 2
Alignment Marks: [count 1]
Analysis Editing View:
DisplayOps: 0x00000000
Analysis Stats: Changes: 9; Conflicts: 2
Alignment Marks: [count 1]
Attachments
DownloadManager diff.zip
(10.22 KiB) Downloaded 113 times

Posts: 8432
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Wed May 27, 2015 8:53 am
We are checking into this, but need a little more information to make sure we're looking at the right thing. Could you send an email to support at sourcegear.com (attn: Beth) with a link to this forum thread? In that email, add a screenshot showing the issue, and another screenshot showing one of the other tools showing it the way you would prefer.
Beth Kieler
SourceGear Technical Support

Posts: 8432
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Wed Jun 03, 2015 10:13 am
Email received.

HS: 235203
Beth Kieler
SourceGear Technical Support

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest

cron