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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx/

Regards
Lin





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux