> From: FLORENT Philippe [mailto:[email protected]] > Sent: Sunday, December 13, 2015 11:39 PM > Subject: [thg] FW: FW: FW: alternative to tortoise merge tool > > Actualy I tested winmerge, wich is way more user friendly and avoids > displaying 3 windows but the problem remains, my collegue and I have the > same code for 80% of the file but the last bits get messed around, since > the merging program is not function-block aware and we got no other > choice than doing a copy paste in notepad++ cos it is way easier to > read what’s going on like this.
Beyond Compare has an Edit -> Align with... menu option which lets you force the two sides of a comparison (3 sides of a merge) to align how you want them to align instead of how the program originally guessed. Check to see if winmerge has a similar option. Mischa ________________________________ This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
