From: Kelvie Wong <kelvie@ieee.org>
Date: Thu, 27 Sep 2007 20:38:19 GMT
Subject: Re: Mergetool generating blank files (1.5.3)
Message-ID: <94ccbe710709271338u79ba89beh5a637bf84f8edf44@mail.gmail.com>
In-Reply-To: <7vd4w3ua2j.fsf@gitster.siamese.dyndns.org>

Egads, it's alive!

I was in a subdirectory (most of my work is in that one subdirectory
anyways :p), but running it on the top level did indeed work as
expected.

Thanks,
Kelvie

On 9/27/07, Junio C Hamano <gitster@pobox.com> wrote:
> "Kelvie Wong" <kelvie@ieee.org> writes:
>
> > And then meld starts up, with the original file in the middle, and two
> > blank files on the side, LOCAL and REMOTE respectively.
>
> Wild guess.  Are you running this from a subdirectory?  I have a
> mild suspicion that mergetool is not subdirectory safe.  Can you
> try running it from the toplevel of the work tree?
>
>


-- 
Kelvie