From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Jan 2012 07:22:23 GMT
Subject: Re: [PATCH] mergetool: Provide an empty file when no base exists
Message-ID: <7v7h0mhm8g.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1327043453-80965-1-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> +    if base_present; then
> +	checkout_staged_file 1 "$MERGED" "$BASE"
> +    else
> +	:>"$BASE"

Just a style, but please write this as either one of the following:

	>"$BASE"
        : >"$BASE"

I tend to prefer the former, but if you have to write a command, we want
to see a SP before the redirection (and no SP before the redirect target).

> +    fi
>      local_present  && checkout_staged_file 2 "$MERGED" "$LOCAL"
>      remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"

Sorry to be ping-pong-ing like this, but wouldn't we have a similar issue
when LOCAL or REMOTE does not exist (e.g. "they modified, we removed")?