summaryrefslogtreecommitdiff
path: root/help.h
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2015-05-20 02:07:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-20 13:13:44 -0700
commit3e4f2373b295e19dbc1a6bd0e743f65b500b7bda (patch)
tree6f01b1a4c5fd077ad07b99b19a9fdc58a031f552 /help.h
parentmergetool--lib: set IFS for difftool and mergetool (diff)
downloadtgif-3e4f2373b295e19dbc1a6bd0e743f65b500b7bda.tar.xz
mergetools: add winmerge as a builtin tool
Add a winmerge scriptlet with the commands described in [1] so that users can use winmerge without needing to perform any additional configuration. [1] http://thread.gmane.org/gmane.comp.version-control.git/268631 Helped-by: Philip Oakley <philipoakley@iee.org> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de> Helped-by: Sebastian Schuberth <sschuberth@gmail.com> Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'help.h')
0 files changed, 0 insertions, 0 deletions