Search found 7 matches

by kmansoft
Tue Jun 11, 2019 11:56 pm
Forum: Support (DiffMerge)
Topic: DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed
Replies: 5
Views: 814

Re: DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed

Tonya, I just installed 4.2.1 beta on Ubuntu 19.04 using your Google Drive link (thankfully you didn't remove it). Worked fine, while 4.2.0 could not be installed due to issues with libcurl3 and libpng12. So I'm wondering - since it worked so well - when will we see 4.2.1 on the Downloads page? http...
by kmansoft
Tue Apr 09, 2019 1:31 pm
Forum: Support (DiffMerge)
Topic: DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed
Replies: 5
Views: 814

Re: DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed

We have an upgraded version of DiffMerge using newer libraries which you can access using the link below: https://drive.google.com/file/d/1sj_6QHV15tIzQBIGJaopMsogyds0pxD9/view Please note the download is in Debian format but you can use Alien to convert the .deb to an .rpm. Thanks, Tonya Thank you...
by kmansoft
Tue Apr 09, 2019 7:42 am
Forum: Support (DiffMerge)
Topic: DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed
Replies: 5
Views: 814

DiffMerge 4.2.1 can't be installed on SuSE Tumbleweed

I'm running SuSE Tumbleweed which is an RPM based distro. --- sudo zypper install ./diffmerge-4.2.0.697.stable-1.x86_64.rpm Loading repository data... Reading installed packages... Resolving package dependencies... Problem: nothing provides libpng15.so.15()(64bit) needed by diffmerge-4.2.0.697.stabl...
by kmansoft
Fri Aug 22, 2014 12:22 pm
Forum: Support (DiffMerge)
Topic: Assert failure when merging
Replies: 3
Views: 4197

Assert failure when merging

DiffMerge 4.2.0 (697...4fcb), Fedora Linux, x86_64 Got this in a three-way merge of text files, resolving a conflict, first merging a block from left into center, then trying to append or re-type the block from the right. ASSERT INFO: de_sync_list.cpp(2081): assert "((pDeLineLastT1==NULL) || (pDeLin...
by kmansoft
Tue Apr 01, 2014 7:00 am
Forum: Support (DiffMerge)
Topic: Unable to ignore space/tab conversion in 4.20
Replies: 4
Views: 4846

Re: Unable to ignore space/tab conversion in 4.20

"Hide Unimportant Differences" did the trick.

Thank you Jeff!
by kmansoft
Mon Mar 31, 2014 2:02 pm
Forum: Support (DiffMerge)
Topic: Unable to ignore space/tab conversion in 4.20
Replies: 4
Views: 4846

Re: Unable to ignore space/tab conversion in 4.20

@Beth -- thank you for your response. That's exactly what I have. This is under my "Java Source" ruleset, but just in case, I've also tried setting the default ruleset to same options, and turning off "Enable custom rulesets". Also: This is on Fedora Linux 64-bit, DiffMerge 4.20 64-bit, installed vi...
by kmansoft
Sun Mar 30, 2014 8:19 am
Forum: Support (DiffMerge)
Topic: Unable to ignore space/tab conversion in 4.20
Replies: 4
Views: 4846

Unable to ignore space/tab conversion in 4.20

Hello,

It seems I'm unable to get DiffMerge 4.20 to ignore space/tab conversions.

The "Line Handling" settings are all enabled, as suggested elsewhere on this forum.

Please see the attachments.

Are my settings correct? If they are, is this a bug and is there a workaround?