diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2009-04-06 01:31:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:56 -0700 |
| commit | 1c0f3d224eff2ff8ca8442811edb5a6830adba1a (patch) | |
| tree | ea2abaf978b348dc99b31a304381e6146cdc5c9a /builtin-unpack-objects.c | |
| parent | 8b7332221db8522fe23bf8cf25d058acea6b9142 (diff) | |
| download | git-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.gz | |
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>
Diffstat (limited to 'builtin-unpack-objects.c')
0 files changed, 0 insertions, 0 deletions