X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_msg;fp=merge_msg;h=7ab7c176e23bcc0ae3162d94f81e8fc250da89d6;hb=aded3d9f8e83f652dddd6b5a1b0ffa206ccabfb1;hp=847698b34f30bc506e4329f12443318bb7fec458;hpb=186acf6b3b550aaa0ed4cd1640528265a2673309;p=next-scripts

diff --git a/merge_msg b/merge_msg
index 847698b..7ab7c17 100755
--- a/merge_msg
+++ b/merge_msg
@@ -8,6 +8,8 @@ fi
 
 gitk --merge -- "$@" &
 
+tools_dir=$(dirname "$0")
+
 printf -v files '  %s\n' "$@"
 conf='a conflict'
 if [ "$#" -gt 1 ]; then
@@ -16,7 +18,7 @@ fi
 
 subject='manual merge of the BRANCH tree with the FIXME tree'
 
-"$(dirname "$0")/message_helper" "${branch[@]}" "$subject" <<EOF
+"$tools_dir/message_helper" "${branch[@]}" "$subject" <<EOF
 FIXME: Add owner of second tree to To:
        Add author(s)/SOB of conflicting commits.