From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Mar 2007 10:55:11 +0000 (-0400)
Subject: mergetool: portability fix: don't use reserved word function
X-Git-Tag: v1.5.1~19^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=262c981ea720c3c67d01d9a556069f79a6170786;p=git-core%2Fgit.git

mergetool: portability fix: don't use reserved word function

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 600aef0a1..0b843a54d 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"