On Mon, Jul 1, 2013 at 11:49 AM, Gilboa Davara <[email protected]> wrote: > On Mon, Jul 1, 2013 at 10:59 AM, Erez D <[email protected]> wrote: >> hello >> >> i am writing code using vim. a college writes in eclipse. >> whenever the eclipse open my files, it changes the amount of spaces inside >> it, and also may split lines. >> >> i'm using vimdiff, and get a lot of cahnges. even the iwhite option doesn't >> help as it does not ignore a single space, and no line changes. >> >> i looked a little bit and couldn't find a solution >> >> beyond compare handles it, but i preffer vi >> >> any idea ? >> > > I do use vimdiff from time to time, but as a comparison tool, it is > somewhat feature incomplete. > I would suggest you give meld [1] a try. > > IMHO its the best merging tool currently available (including built in > support for SVN/GIT/BZR/CVS/etc) - in many ways much better than many > proprietary solutions. > In your case, meld can be configured (via regex) to ignore white > spaces or any other complex expression. > > - Gilboa
[1] http://meldmerge.org/ - Gilboa _______________________________________________ Linux-il mailing list [email protected] http://mailman.cs.huji.ac.il/mailman/listinfo/linux-il
