From: lin.sun@zoom.us
Date: Sun, 12 Jul 2020 14:07:13 GMT
Subject: RE: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior
Message-ID: <003701d65855$c1874320$4495c960$@zoom.us>
In-Reply-To: <261a01d655a0$71077210$53165630$@zoom.us>

Hi Junio,

I had add a new c function ` git_config_bool_or_str()` to support get the 
configured value for true/false/auto with git. It will make the `mergetool/meld`
only calling `git config` once for getting the `useAutoMerge`.

Please review the [PATH v16], thanks.
https://lore.kernel.org/git/pull.781.v16.git.git.1594544903477.gitgitgadget@gmail.com

Regards
Lin