summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorTim Henigan <tim.henigan@gmail.com>2012-03-05 14:28:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-05 17:31:47 (GMT)
commit284a126c3ef3dfedede9bc64df4cf3a24600dea5 (patch)
tree9953ba633e4b7e1acc85eb46647e39cb83d1cde8 /Documentation/git-difftool.txt
parent222433ee4b57750174875ce6b252d10c009a1fa9 (diff)
downloadgit-284a126c3ef3dfedede9bc64df4cf3a24600dea5.zip
git-284a126c3ef3dfedede9bc64df4cf3a24600dea5.tar.gz
git-284a126c3ef3dfedede9bc64df4cf3a24600dea5.tar.bz2
mergetools: add a plug-in to support DeltaWalker
DeltaWalker is a non-free tool popular among some users. Add a plug-in to support it from difftool and mergetool. Note that the $(pwd)/ in front of $MERGED should not be necessary. However without it, DeltaWalker crashes with a JRE exception. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions