diff options
| author | John Keeping <john@keeping.me.uk> | 2013-06-16 17:51:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-17 20:12:55 (GMT) |
| commit | d2512fc94fe75d8836a6fc965951d8180dbddbe6 (patch) | |
| tree | 6737daabc518221b7760efcee05e6b374e1529a3 /match-trees.c | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-d2512fc94fe75d8836a6fc965951d8180dbddbe6.zip git-d2512fc94fe75d8836a6fc965951d8180dbddbe6.tar.gz git-d2512fc94fe75d8836a6fc965951d8180dbddbe6.tar.bz2 | |
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>
Diffstat (limited to 'match-trees.c')
0 files changed, 0 insertions, 0 deletions