summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2010-01-10 04:02:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-10 06:41:28 (GMT)
commitdb367136605868f5971d42501a48820ccdcb8b08 (patch)
treede23922e485753f5193a4409507dff637e7cf45c
parent4cefa495ca91ad833084ebf3f73c77997920ae9b (diff)
downloadgit-db367136605868f5971d42501a48820ccdcb8b08.zip
git-db367136605868f5971d42501a48820ccdcb8b08.tar.gz
git-db367136605868f5971d42501a48820ccdcb8b08.tar.bz2
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>
-rwxr-xr-xgit-difftool--helper.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 57e8e32..1b13808 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"
}