From: Theodore Tso <tytso@mit.edu>
Date: Fri, 30 Mar 2007 02:54:11 GMT
Subject: Re: [PATCH] mergetool: Clean up description of files and prompts for merge resolutions
Message-ID: <20070330025411.GD3198@thunk.org>
In-Reply-To: <20070329222905.GA25347@moooo.ath.cx>

On Fri, Mar 30, 2007 at 12:29:05AM +0200, Matthias Lederhofer wrote:
> Theodore Ts'o <tytso@mit.edu> wrote:
> > +    printf "  {$branch}: "
> This should use %s too.

It's strictly not necessary since $branch is either "local" or "remote".

						- Ted