[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Viewing diffs in unified format in vim

From: <bd_at_bc-bd.org>
Date: Tue, 30 Sep 2008 12:28:12 +0000

On Tue, Sep 30, 2008 at 08:00:43AM -0400, Tim Schultze wrote:
> On my system, I put the following in my External Diff line:
>
> C:\Program Files\Vim\Vim71\gvim.exe -d -g %base %mine
>
> And it appears to work fine (at least in simple cases). What do you mean by
> "unified format?"

Well a diff in unified diff format:

        - http://en.wikipedia.org/wiki/Unified_diff#Unified_format
        - man diff, search for -u

I am attaching 3 files, foo, bar and a diff between those two:

 # diff -u foo bar > diff

If you run svn diff you will get a unified diff.

        Stefan

-- 
You never have to change anything you got up in the middle of the night
to write.
		-- Saul Bellow




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

  • text/plain attachment: foo
  • text/plain attachment: bar
  • text/plain attachment: diff
Received on 2008-09-30 14:28:11 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.