Re: Kernel SCM: When does CVS fall down where it REALLY matters?

Alex Riesen
2002-03-08T07:38:36Z

On Thu, Mar 07, 2002 at 04:26:41PM -0800, Andrew Morton wrote:
...
>
> Current tkdiff is in fact very good at this. So integration
> with that may suit.
>
> The problem I find is that I often want to take (file1+patch) -> file2,
> when I don't have file1. But merge tools want to take (file1|file2) -> file3.
> I haven't seen a graphical tool which helps you to wiggle a patch into
> a file.
>
Try vimdiff/gvimdiff from VIM 6.0. I think it does pretty good that job
(wiggle... what a word :)
-alex