Skip to content
Snippets Groups Projects
Commit 980145f7 authored by Fernando Ramos's avatar Fernando Ramos Committed by Junio C Hamano
Browse files

mergetools: add description to all diff/merge tools


The output of `git mergetool --tool-help` and `git difftool --tool-help`
only showed the `alias` of each available merge/diff tool.

It is not always obvious what tool these `aliases` end up using (ex:
`opendiff` runs `FileMerge` and `bc` runs `Beyond Compare`).

This commit adds a short description to each of them to help the user
identify the `alias` they want.

Signed-off-by: default avatarFernando Ramos <greenfoo@u92.eu>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 7b5cf8be
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment