Am 28.12.20 um 05:54 schrieb Seth House:
> Hat-tip to Junio C Hamano for the implementation.
We usually write this as
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
>
> Signed-off-by: Seth House <seth@xxxxxxxxx>
> ---
> git-mergetool--lib.sh | 4 ++++
> git-mergetool.sh | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index e059b3559e..5084ceffeb 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -164,6 +164,10 @@ setup_tool () {
> return 1
> }
>
> + automerge_enabled () {
> + true
I would have written this as `return 0` instead of `true` like some of
the functions above this hunk.
> + }
> +
> translate_merge_tool_path () {
> echo "$1"
> }
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 929192d0f8..a44afd3822 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -336,7 +336,7 @@ merge_file () {
>
> initialize_merge_tool "$merge_tool"
>
> - if test "$(
> + if automerge_enabled && test "$(
> git config --get --bool "mergetool.$merge_tool.automerge" ||
> git config --get --bool "mergetool.automerge" ||
> echo true)" = true
>
-- Hannes
