mergetool: portability fix: don't use reserved word function
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o committed
Mar 29, 2007 at 06:55 UTC
262c981ea720c3c67d01d9a556069f79a6170786
1 file changed
+5
-5
git-mergetool.sh
+5
-5
@@ -14,19 +14,19 @@ SUBDIRECTORY_OK=Yes
14
require_work_tree
15
16
# Returns true if the mode reflects a symlink
17
-function is_symlink () {
17
+is_symlink () {
18
test "$1" = 120000
19
}
20
21
-function local_present () {
21
+local_present () {
22
test -n "$local_mode"
23
}
24
25
-function remote_present () {
25
+remote_present () {
26
test -n "$remote_mode"
27
}
28
29
-function base_present () {
29
+base_present () {
30
test -n "$base_mode"
31
}
32
@@ -39,7 +39,7 @@ cleanup_temp_files () {
39
fi
40
}
41
42
-function describe_file () {
42
+describe_file () {
43
mode="$1"
44
branch="$2"
45
file="$3"