![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Pipping <sebastian@pipping.org> | |
| Mon, 6 Apr 2009 08:31:23 +0000 (01:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:19:56 +0000 (22:19 -0700) | ||
| commit | 1c0f3d224eff2ff8ca8442811edb5a6830adba1a | |
| tree | ea2abaf978b348dc99b31a304381e6146cdc5c9a | tree | snapshot |
| parent | 8b7332221db8522fe23bf8cf25d058acea6b9142 | commit | diff |
difftool/mergetool: add diffuse as merge and diff tool
This adds diffuse as a built-in merge tool.
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This adds diffuse as a built-in merge tool.
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>