Subject: RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior

From: <[email-masked]>
Date: Thu, 9 Jul 2020 11:24:20 +0800

Hi Junio,

I'll add SP on both side of  '|', and remove the backslash, thank you.

This line assign value with `git config --bool...` is over 80 characters, so there is a break. 

>> +			else
>> +				meld_use_auto_merge_option=false
>Why? Shoudln't we loudly complain to let the user know of a misspelt value in the configuration?

The command line `git config --bool ...` without "2>&/dev/null" will print error message, just passthrough to user.
$ git config mergetool.meld.useAutoMerge hello 
$ git mergetool --tool=meld 
fatal: bad numeric config value 'hello' for 'mergetool.meld.useautomerge' in .git/config: invalid unit

I'll upload the changes soon.

Regards
Lin