Does not work resolve with kdiff3, when merge with local
Created originally on Bitbucket by andrew312 (Andrew)
When i am try to merge the default branch and branch2 , there is a conflict "1 files were modified on both branches and must be resolved" -Take "Tool Resolve" Message: "Conflicts Left. There is a line end style conflict. Please choose the line end style manually. File not saved." Message: "File Open Error. Opening of these files failed: -base; -parent2" In both branchs "line end style" - dos/windows. TortoiseHg 4.3.1 , TortoiseHg 4.2.2. Windows 7 32, Windows Xp 32.