From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2007 20:28:52 GMT
Subject: Re: Mergetool generating blank files (1.5.3)
Message-ID: <7vd4w3ua2j.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <94ccbe710709271312k7eac8e35y353180596a0abc9a@mail.gmail.com>

"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?