[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Monotone VIM 3-way merging fixes.
|
From: |
Nathaniel Smith |
|
Subject: |
Re: [Monotone-devel] Monotone VIM 3-way merging fixes. |
|
Date: |
Wed, 3 Aug 2005 13:03:41 -0700 |
|
User-agent: |
Mutt/1.5.9i |
On Wed, Aug 03, 2005 at 10:53:57AM -0500, Matthew A. Nicholson wrote:
> The attached patch contains fixes for vim 3-way and 2-way merging. Like
> meld, the current version of vim has limits on it's merging
> functionality. This patch works around those.
Committed in b5b64094b72a8ab38539b9a7a8bb75cf321a788d.
-- Nathaniel
--
"The problem...is that sets have a very limited range of
activities -- they can't carry pianos, for example, nor drink
beer."