From 6c7256a1778f0ef994534650e79e15412029a98e Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Nov 2008 14:02:37 +1100
Subject: [PATCH] make the files we pass to gitk explicit

---
 merge_msg1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_msg1 b/merge_msg1
index 737e905..0ff3170 100755
--- a/merge_msg1
+++ b/merge_msg1
@@ -11,7 +11,7 @@ branch=${branch%%/*}
 
 contact=$(sed -n "/	$branch	/s/	.*$//p" $control)
 
-gitk --merge $1 &
+gitk --merge -- $1 &
 gvim $1
 sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
 %0A\
-- 
2.39.5