Jan what is your fix? to show the end of line differently? Do you think that we should integrate it? Stef
Le 20/4/15 12:36, Jan Vrany a écrit :
Hi, I just wanted to merge some code in Monticello and the merge tool marked all methods as conflict because their source differ in trailing whitespace (newline). The diff panel on the right does not show any difference. http://smalltalkhub.com/#!/~JanVrany/Misc/versions/Monticello-Fixes-JanVrany.1 Here's a fix for this particular problem in case somebody runs into the same problem. Best, Jan
