From db367136605868f5971d42501a48820ccdcb8b08 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 9 Jan 2010 20:02:40 -0800 Subject: [PATCH] difftool--helper: Update copyright and remove distracting comments Some of the comments in git-difftool--helper are not needed because the code is sufficiently readable without them. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-difftool--helper.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 57e8e3256..1b138083d 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -3,9 +3,8 @@ # This script is typically launched by using the 'git difftool' # convenience command. # -# Copyright (c) 2009 David Aguilar +# Copyright (c) 2009-2010 David Aguilar -# Load common functions from git-mergetool--lib TOOL_MODE=diff . git-mergetool--lib @@ -20,7 +19,6 @@ should_prompt () { fi } -# Sets up shell variables and runs a merge tool launch_merge_tool () { # Merged is the filename as it appears in the work tree # Local is the contents of a/filename @@ -39,7 +37,6 @@ launch_merge_tool () { read ans fi - # Run the appropriate merge tool command run_merge_tool "$merge_tool" } -- 2.26.2