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"
}