commit | 665682c9fd81df7e2dc8fe9db28fa5918a2f8ba0 | [log] [tgz] |
---|---|---|
author | John Keeping <john@keeping.me.uk> | Wed Jan 30 19:55:46 2013 +0000 |
committer | Junio C Hamano <gitster@pobox.com> | Sat Feb 02 21:46:52 2013 -0800 |
tree | cb6c4540f02a73be17ea9a3e3770cd5612c27af4 | |
parent | 17a1f1c5b7041afab2e184304d8194a2f81f196d [diff] |
mergetool--lib: list user configured tools in '--tool-help' Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>