Thread (1 message) 1 message, 1 author, 2020-07-09

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

From: Junio C Hamano <hidden>
Date: 2020-07-09 04:49:58

[off-list ref] writes:
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. 
quoted
quoted
+			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
Yes, but you do not exit(1) here, so the user will keep going
without having a chance to stop, think and correct the misspelt
value in the configuration file, no?
I'll upload the changes soon.

Regards
Lin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help