[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 22:37:35 -0800 |
|
User-agent: |
Mutt/1.5.6+20040907i |
On Mon, Feb 14, 2005 at 10:50:17PM -0600, Matthew A. Nicholson wrote:
> +function merge2_vim_cmd(vim, lfile, rfile, outfile)
> + local cmd_fmt = "%s -d -c \"file %s\" \"%s\" \"%s\""
> + return string.format(cmd_fmt, vim, outfile, lfile, rfile)
> +end
Ported to head and applied.
-- Nathaniel
--
Details are all that matters; God dwells there, and you never get to
see Him if you don't struggle to get them right. -- Stephen Jay Gould