Skip to content

Commit db36713

Browse files
davvidgitster
authored andcommitted
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>
1 parent 4cefa49 commit db36713

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

git-difftool--helper.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
# This script is typically launched by using the 'git difftool'
44
# convenience command.
55
#
6-
# Copyright (c) 2009 David Aguilar
6+
# Copyright (c) 2009-2010 David Aguilar
77

8-
# Load common functions from git-mergetool--lib
98
TOOL_MODE=diff
109
. git-mergetool--lib
1110

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

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

42-
# Run the appropriate merge tool command
4340
run_merge_tool "$merge_tool"
4441
}
4542

0 commit comments

Comments
 (0)