From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 3D1BB1F5AE for ; Thu, 9 Jul 2020 02:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726124AbgGICnC (ORCPT ); Wed, 8 Jul 2020 22:43:02 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:59676 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726081AbgGICnC (ORCPT ); Wed, 8 Jul 2020 22:43:02 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id E22617B22D; Wed, 8 Jul 2020 22:42:59 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=Wo8oz5UCZZQm5PD34TcX9un6BJ4=; b=bj3Tkj MNs8KGZC27TyrqPD8wwxd93pZPYm6O87A4ENYx6SKkB3YnQzO3A0msvyi88g/oGi tJXCKnOUQkiMs605DMwtA3y1QJf2q5ddXfRXBAyfke+7S/LB3rAbmfHvdB8pGu3M FOT+rPpKdz2Q2Z+AFrIHijCCFRZaUcWJvWoZ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=UkFYX8iZr5UJNH0XBdhb3uXMxNdhEfSk xBj/2HAbDfTdbpQAaRR/7YQxv0g5zG21rYObXieROpfFGwZnzJqOgaT7DgnFdGGe sJYqr9hI2Kb63Eyn397KZpOkefQEh8DbyNBS1mUqerJ7qx+ypsACH5CoJUrdVXQ7 r1PIZrr6vVI= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id D92C07B22C; Wed, 8 Jul 2020 22:42:59 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 6C6927B22B; Wed, 8 Jul 2020 22:42:59 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "sunlin via GitGitGadget" Cc: git@vger.kernel.org, sunlin , Lin Sun Subject: Re: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior References: Date: Wed, 08 Jul 2020 19:42:58 -0700 In-Reply-To: (sunlin via GitGitGadget's message of "Thu, 09 Jul 2020 00:35:06 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: E6C7413E-C18D-11EA-A313-01D9BED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "sunlin via GitGitGadget" writes: > From: Lin Sun > Subject: Re: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior I'd retitle to match the recommended structure, e.g. Subject: [PATCH] mergetool: update meld backend to allow using '--auto-merge' while queuing. Thanks. I might have more comments later.