[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Vimdiff 2 and 3-way merge support

From: Nathaniel Smith
Subject: Re: [Monotone-devel] Vimdiff 2 and 3-way merge support
Date: Mon, 14 Feb 2005 15:30:11 -0800
User-agent: Mutt/1.5.6+20040907i

On Mon, Feb 14, 2005 at 04:17:12PM -0600, Matthew A. Nicholson wrote:
> Here is a patch to std_hooks.lua to add vimdiff support for 2 and 3 way 
> merge. For the merge to work, the user must save all changes in the 
> left-most file in the vim window. (they will also have to press enter to 
> vim's prompt when it starts)

Cool, thanks.

Umm... can you confirm that these actually work, in light of your last
email message, though?  I'll wait to apply them until then :-).

-- Nathaniel

"But suppose I am not willing to claim that.  For in fact pianos
are heavy, and very few persons can carry a piano all by themselves."

reply via email to

[Prev in Thread] Current Thread [Next in Thread]