Re: [PATCH v4] Enable auto-merge for meld to follow the vim-diff beharior

From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Jun 30, 2020, 23:01 UTC
Message-ID: <20200630230145.GB15821@danh.dev>
In-Reply-To: <20200630162333.GA15821@danh.dev>

On 2020-06-30 23:23:33+0700, Đoàn Trần Công Danh <congdanhqx@gmail.com> wrote:

Show 15 quoted lines

> > +			then
> > +				: old ones mention --output and new ones just say OPTION...
> > +				meld_has_output_option=true
> > +			else
> > +				meld_has_output_option=false
> > +			fi
> > +		fi
> > +	fi
> > +	# Check whether we should use 'meld --auto-merge ...'
> > +	if test -z "${meld_has_auto_merge_option:+set}"
> >  	then
> > -		: old ones mention --output and new ones just say OPTION...
> > -		meld_has_output_option=true
> 
> I think something was forgotten here?

Please read this line as: Is this a copy-paste and forget to edit-afterward. Somehow that line was lost.

Sorry for the extra noise

Thanks, Danh