[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

DORMANTno replies

[PATCH] mergetool: portability fix: don't use reserved word function

From: Theodore Ts'o <tytso@mit.edu>
Date: 2016-06-15 22:43:02
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 git-mergetool.sh |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 7d2dadd..8a87f5e 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh

@@ -14,19 +14,19 @@ SUBDIRECTORY_OK=Yes
 require_work_tree
 
 # Returns true if the mode reflects a symlink
-function is_symlink () {
+is_symlink () {
     test "$1" = 120000
 }
 
-function local_present () {
+local_present () {
     test -n "$local_mode"
 }
 
-function remote_present () {
+remote_present () {
     test -n "$remote_mode"
 }
 
-function base_present () {
+base_present () {
     test -n "$base_mode"
 }

@@ -39,7 +39,7 @@ cleanup_temp_files () {
     fi
 }
 
-function describe_file () {
+describe_file () {
     mode="$1"
     branch="$2"
     file="$3"

-- 
1.5.1.rc2.1.g8afe-dirty