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

From: Alex Riesen (Alexander.Riesen@synopsys.com)
Date: Fri Mar 08 2002 - 02:37:58 EST


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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Fri Mar 15 2002 - 22:00:07 EST