diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-06-16 18:51:22 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-17 13:12:55 -0700 |
| commit | d2512fc94fe75d8836a6fc965951d8180dbddbe6 (patch) | |
| tree | 6737daabc518221b7760efcee05e6b374e1529a3 /contrib/examples/git-reset.sh | |
| parent | Git 1.8.3 (diff) | |
| download | tgif-d2512fc94fe75d8836a6fc965951d8180dbddbe6.tar.xz | |
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 'contrib/examples/git-reset.sh')
0 files changed, 0 insertions, 0 deletions