kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
David Aguilar 2010-01-09 20:02:40 -08:00 committed by Junio C Hamano
parent 4cefa495ca
commit db36713660
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-difftool--helper.sh
View File

@ -3,9 +3,8 @@
# This script is typically launched by using the 'git difftool' # This script is typically launched by using the 'git difftool'
# convenience command. # convenience command.
# #
# Copyright (c) 2009 David Aguilar # Copyright (c) 2009-2010 David Aguilar


# Load common functions from git-mergetool--lib
TOOL_MODE=diff TOOL_MODE=diff
. git-mergetool--lib . git-mergetool--lib


@ -20,7 +19,6 @@ should_prompt () {
fi fi
} }


# Sets up shell variables and runs a merge tool
launch_merge_tool () { launch_merge_tool () {
# Merged is the filename as it appears in the work tree # Merged is the filename as it appears in the work tree
# Local is the contents of a/filename # Local is the contents of a/filename
@ -39,7 +37,6 @@ launch_merge_tool () {
read ans read ans
fi fi


# Run the appropriate merge tool command
run_merge_tool "$merge_tool" run_merge_tool "$merge_tool"
} }