On Mon, Feb 14, 2005 at 03:58:54PM -0600, Matthew A. Nicholson wrote:
/usr/bin/gvim
executing external 3-way merge command: gvim -d -c "file /tmp/mt.SOoJ1F"
"/tmp/mt.1VFhJW" "/tmp/mt.k60S5Q" "/tmp/mt.ZDoqvL"
3 files to edit
monotone: misuse: merge of 'qview.c' :
'a82b1586c8401f9ca96fb83d625747bbb6dfc949' ->
'1997cc15ca3cdbe6814a242cbfef9461566c8ccc' vs
'285326a87e806bbe44fbb42aaf399a4fa6fe2cfc' failed
Monotone is claiming that your merge tool (vimdiff, I guess), failed;
in particular, it looks like in 0.16 we detect failure by noticing
that the output file that was produced is empty. I guess I might
double-check that you're running gvim correctly?
(Random thought: Is the first argument to gvim really supposed to have
the literal string "file " in it?)
-- Nathaniel