On 2010-01-20, Carl Bolduc wrote: > I am trying to compare two xml files using vimdiff under Windows. Both > files are similar except for several additions in the latest file > (right in the attached screenshot) that are not in the oldest file > (left in the attached screenshot). > > As you can see in the attached screenshot, "<string > name="AllConversation..." is in both file, simply located at different > lines in the two files. If I run GNU diff against those two file, that > line is not reported as being a difference. Am I just not > understanding how to interpret this visually?
One thing that strikes me in looking at that image is that all the lines in the right window end in "^M" whereas the lines in the left window do not. Your GNU diff apparently ignores those line-ending differences. One way to fix that problem would be to delete all the ^Ms from the ends of the lines in the right window, then execute ":diffu". If every line in the right file ended in ^M, I think vim would have detected that the 'fileformat' was "dos" and would have handled the diff as you expect. Regards, Gary
-- You received this message from the "vim_use" maillist. For more information, visit http://www.vim.org/maillist.php
