Hi David, Junio, Appreciate for your comments, I rewrite the "mergetool/meld" to follow your comments and suggestions. It will respect the git config first, then detect the options if no configuration for them, and also reduce the subprocess calling. Both the modified-file and patch-file are appended. Please review again. Thanks Regards Lin Sun
Attachment:
0001-Enable-auto-merge-for-meld-to-follow-the-vim-diff-be.patch
Description: Binary data
Attachment:
meld
Description: Binary data