Is there anyway to take a standard diff and get a vimdiff output?

kinasz · 02-04-2008, 08:13 PM

Is there anyway to take a standard diff file and get a vimdiff output?

unSpawn · 02-04-2008, 08:47 PM

As far as I know 'vim -d fileOne fileTwo' is just presentation, like doing 'diff --sideby-side fileOne fileTwo|less', not a file format.

kinasz · 02-04-2008, 08:54 PM

But if you do a diff of two files "diff file1.x file2.x > file3.diff" is there a way to view file3.diff "side-by-side", as in display it like you would see the results of a vimdiff?

In this example I only have file1.x and file3.diff. The .diff file was created remotely and I'm looking for a more pleasent way to view them.

unSpawn · 02-05-2008, 07:21 AM

Well the "file3.diff" is the result of "file1.x" and changes in "file2.x", so if you patch "file1.x" with "file3.diff" the result should be "file2.x", right?

kinasz · 02-05-2008, 05:53 PM

ahh i see what your saying so I could get my vimmdiff by doing:

patch -s --output=/tmp/deleteme.x file1.x file3.diff && vimdiff file1.x /tmp/deleteme.x

Thanks