kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Tim Henigan	284a126c3e	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>	2012-03-05 09:31:47 -08:00

Author

SHA1

Message

Date

Tim Henigan

284a126c3e

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>

2012-03-05 09:31:47 -08:00

1 Commits (74b15bfbf6f7efffa40fda170b3a3cb0218d8651)