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

From: lin.sun@zoom.us <lin.sun@zoom.us>
Date: Jul 9, 2020, 03:24 UTC
Message-ID: <261a01d655a0$71077210$53165630$@zoom.us>
In-Reply-To: <xmqqh7uhz98q.fsf@gitster.c.googlers.com>

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.