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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 57e8e3256d7b6578cda37815163d8945431aa6db..1b138083d3642af596fe56a74c4f98321e6135fc 100755 (executable)
--- 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.
 #
 # 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
 
 TOOL_MODE=diff
 . git-mergetool--lib
 


@@ -20,7 +19,6 @@ should_prompt () {
        fi
 }
 
        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
 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
 
                read ans
        fi
 

-       # Run the appropriate merge tool command

        run_merge_tool "$merge_tool"
 }
 
        run_merge_tool "$merge_tool"
 }