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>
David Aguilar committed
Jan 9, 2010 at 20:02 UTC
db367136605868f5971d42501a48820ccdcb8b08
1 file changed
+1
-4
git-difftool--helper.sh
+1
-4
@@ -3,9 +3,8 @@
3
# This script is typically launched by using the 'git difftool'
4
# convenience command.
5
#
6
-# Copyright (c) 2009 David Aguilar
6
+# Copyright (c) 2009-2010 David Aguilar
7
8
-# Load common functions from git-mergetool--lib
8
TOOL_MODE=diff
9
. git-mergetool--lib
10
@@ -20,7 +19,6 @@ should_prompt () {
19
fi
20
}
21
23
-# Sets up shell variables and runs a merge tool
22
launch_merge_tool () {
23
# Merged is the filename as it appears in the work tree
24
# Local is the contents of a/filename
@@ -39,7 +37,6 @@ launch_merge_tool () {
37
read ans
38
fi
39
42
- # Run the appropriate merge tool command
40
run_merge_tool "$merge_tool"
41
}
42