summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cefa49)
raw | patch | inline | side by side (parent: 4cefa49)
author | David Aguilar <davvid@gmail.com> | |
Sun, 10 Jan 2010 04:02:40 +0000 (20:02 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 10 Jan 2010 06:41:28 +0000 (22:41 -0800) |
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>
the code is sufficiently readable without them.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool--helper.sh | patch | blob | history |
index 57e8e3256d7b6578cda37815163d8945431aa6db..1b138083d3642af596fe56a74c4f98321e6135fc 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
# 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
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
read ans
fi
- # Run the appropriate merge tool command
run_merge_tool "$merge_tool"
}