mirror of
https://github.com/git/git.git
synced 2024-04-25 12:35:11 +02:00
980145f747
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: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
35 lines
535 B
Plaintext
35 lines
535 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
diff_cmd_help () {
|
|
echo "Use Emacs' Emerge"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" \
|
|
-f emerge-files-with-ancestor-command \
|
|
"$LOCAL" "$REMOTE" "$BASE" \
|
|
"$(basename "$MERGED")"
|
|
else
|
|
"$merge_tool_path" \
|
|
-f emerge-files-command \
|
|
"$LOCAL" "$REMOTE" \
|
|
"$(basename "$MERGED")"
|
|
fi
|
|
}
|
|
|
|
merge_cmd_help () {
|
|
echo "Use Emacs' Emerge"
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
echo emacs
|
|
}
|
|
|
|
exit_code_trustable () {
|
|
true
|
|
}
|