git.99rst.org Git - git.git/commit

author	Tim Henigan <redacted>
	Mon, 5 Mar 2012 14:28:07 +0000 (09:28 -0500)
committer	Junio C Hamano <redacted>
	Mon, 5 Mar 2012 17:31:47 +0000 (09:31 -0800)
commit	284a126c3ef3dfedede9bc64df4cf3a24600dea5
tree	9953ba633e4b7e1acc85eb46647e39cb83d1cde8	tree \| snapshot
parent	222433ee4b57750174875ce6b252d10c009a1fa9	commit \| diff

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 <redacted>
Helped-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>

mergetools/deltawalker

[new file with mode: 0644]

blob

RSS Atom

git clone https://git.99rst.org/PROJECT