[GIT PULL] git mergetool fixes · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] Fix minor formatting issue in man page for git-mergetool · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Don't error out in the merge case where the local file is deleted · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: portability fix: don't assume true is in /bin · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: portability fix: don't use reserved word function · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: factor out common code · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Remove spurious error message if merge.tool config option not set · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Fix abort command when resolving symlinks and deleted files · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Add support for Apple Mac OS X's opendiff command · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Make git-rm quiet when resolving a deleted file conflict · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
[PATCH] mergetool: Clean up description of files and prompts for merge resolutions · Theodore Ts'o <tytso@mit.edu> · 2016-06-15
Re: [PATCH] mergetool: Clean up description of files and prompts for merge resolutions · Matthias Lederhofer <hidden> · 2016-06-15
Re: [PATCH] mergetool: Clean up description of files and prompts for merge resolutions · Theodore Tso <tytso@mit.edu> · 2016-06-15
Re: [PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable · Matthias Lederhofer <hidden> · 2016-06-15
Re: [PATCH] mergetool: Replace use of "echo -n" with printf(3) to be more portable · Theodore Tso <tytso@mit.edu> · 2016-06-15

Re: [PATCH] mergetool: Clean up description of files and prompts for merge resolutions

From: Theodore Tso <tytso@mit.edu>
Date: 2016-06-15 22:43:02

On Fri, Mar 30, 2007 at 12:29:05AM +0200, Matthias Lederhofer wrote:

Theodore Ts'o [off-list ref] wrote:

quoted

+    printf "  {$branch}: "

This should use %s too.

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

						- Ted

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help