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 600aef0a124bab59ef42c426c44f5690f9131cf7..0b843a54de82bf9b4cd2c3f17428841cfa0848c7 100755 (executable)
--- 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
 require_work_tree
 
 # Returns true if the mode reflects a symlink

-function is_symlink () {
+is_symlink () {

     test "$1" = 120000
 }
 
     test "$1" = 120000
 }
 

-function local_present () {
+local_present () {

     test -n "$local_mode"
 }
 
     test -n "$local_mode"
 }
 

-function remote_present () {
+remote_present () {

     test -n "$remote_mode"
 }
 
     test -n "$remote_mode"
 }
 

-function base_present () {
+base_present () {

     test -n "$base_mode"
 }
 
     test -n "$base_mode"
 }
 


@@ -39,7 +39,7 @@ cleanup_temp_files () {
     fi
 }
 
     fi
 }
 

-function describe_file () {
+describe_file () {

     mode="$1"
     branch="$2"
     file="$3"
     mode="$1"
     branch="$2"
     file="$3"