summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-29 10:55:11 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2007-03-29 16:23:01 (GMT)
commit262c981ea720c3c67d01d9a556069f79a6170786 (patch)
tree6409593f9a0efd2260ed6b689385b83245d57777 /git-mergetool.sh
parentd1dc6959bbff89496e3ae5d845d73e98ae213e09 (diff)
downloadgit-262c981ea720c3c67d01d9a556069f79a6170786.zip
git-262c981ea720c3c67d01d9a556069f79a6170786.tar.gz
git-262c981ea720c3c67d01d9a556069f79a6170786.tar.bz2
mergetool: portability fix: don't use reserved word function
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 600aef0..0b843a5 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"