Re: [PATCH] mergetool merge/skip/abort

From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Jan 21, 2009, 18:49 UTC
Message-ID: <200901211949.53432.markus.heidelberg@web.de>
In-Reply-To: <81bfc67a0901210817r49971c09kea9dc8ee5ae21572@mail.gmail.com>

Caleb Cushing, 21.01.2009:

>  git-mergetool.sh |   24 ++++++++++++++++++++----
>  1 files changed, 20 insertions(+), 4 deletions(-)

> +               case "$ans" in
> +                       [mM]*)
> +                       break

I'd like to keep (additionally) the behaviour, that the merge starts with just pressing <Enter>. Because what you mostly want to do, when using git-mergetool, is actually merging.

> -    case "$merge_tool" in
> +       case "$merge_tool" in
>         kdiff3)

This doesn't seem right.

Markus