[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Vimdiff with monotone
|
From: |
Nathaniel Smith |
|
Subject: |
Re: [Monotone-devel] Vimdiff with monotone |
|
Date: |
Mon, 11 Oct 2004 23:57:10 -0700 |
|
User-agent: |
Mutt/1.5.6i |
On Tue, Oct 12, 2004 at 12:56:00AM -0500, Matthew A. Nicholson wrote:
> I am looking through the docs and I see a lua script for dealing with
> operations such as merge2 and merge3, how can I use vimdiff as the conflict
> resolution proggy. Do I just need to implment those functions calling
> vimdiff instead of emacs and such?
Yes. See std_hooks.lua in the source distribution; that has example
hooks to use emacs, xxdiff, CVS "merge", ...
-- Nathaniel
--
Eternity is very long, especially towards the end.
-- Woody Allen