John Keeping d2512fc94f mergetool--lib: refactor {diff,merge}_cmd logic ...

Instead of needing a wrapper to call the diff/merge command, simply
provide the diff_cmd and merge_cmd functions for user-specified tools in
the same way as we do for built-in tools.

Signed-off-by: John Keeping <john@keeping.me.uk>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2013-06-17 13:12:55 -07:00

7.4 KiB

Raw Blame History

View Raw