|
From: Preston, K. <kei...@en...> - 2005-06-27 18:28:19
|
Hello, my name is Keith Preston and I work for Engenio Information Technologies. We recent incorporated your wonderful Kdiff3 program in our code management software (Telelogic's CM synergy) However we are coming across a few simple problems with the resulting code merge. Our biggest problem was when there are large chunks of code added in the middle of the file (1000+ lines) the matching algorithm does not always line up the code correctly. I was wondering if there was an option to increase the number of look ahead lines in the source code as we had this same problem with diff3 and worked to change it. We have experimented with the try harder box, but have not had good results. I didn't know if this box searched farther ahead or just used a different algorithm. Sometime it works better and sometime worse. Keith |