mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2007-03-29 06:55:11 -04:00
parent d1dc6959bb
commit 262c981ea7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git-mergetool.sh
View File

@ -14,19 +14,19 @@ SUBDIRECTORY_OK=Yes
require_work_tree require_work_tree
# Returns true if the mode reflects a symlink # 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" mode="$1"
branch="$2" branch="$2"
file="$3" file="$3"