From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Jan 2012 07:39:16 GMT
Subject: Re: [PATCH] mergetool: Provide an empty file when no base exists
Message-ID: <7vty3qg6vv.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vy5t2g6za.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Yuck, sorry for sending out a edit-in-progress copy.

> It almost makes me wonder if the obviously simplest change to make
> checkout_staged_file create an empty file when the asked-for stage does
> not exist, i.e.

It should read

It almost makes me wonder if the obviously simplest change to make
checkout_staged_file create an empty file when the asked-for stage does
not exist is good enough, i.e.