From: lin.sun@zoom.us
Date: Wed, 08 Jul 2020 03:31:53 GMT
Subject: RE: [PATCH v12] Support auto-merge for meld to follow the vim-diff behavior
Message-ID: <089101d654d8$55503fc0$fff0bf40$@zoom.us>
In-Reply-To: <pull.781.v12.git.git.1594178716840.gitgitgadget@gmail.com>

Hi Junio, Doah,

The [PATCH v12] Is uploaded, in which,
1. "$meld_path" is quoted.
2. the logical for deal true/false/auto is flow Junio's comment
3. error message will emit for invalid configuration value
$ git config mergetool.meld.useAutoMerge invalid_boolean_value
$ git mergetool --tool=meld
...
fatal: bad numeric config value 'hello' for 'mergetool.meld.useautomerge' in .git/config: invalid unit

Please review again, thank you.
https://lore.kernel.org/git/pull.781.v12.git.git.1594178716840.gitgitgadget@gmail.com/

Regards
Lin