On 2022-08-17, aohan237 wrote: > @chrisbra maybe the way git mergetool use vimdiff cause this. > > @vim-ml 's cmd solution goes right. maybe i should ask git for an answer, > there > is no doc on this feature
I don't know whether you saw my earlier, lengthy reply to Chris, but that answered the question of _what_ changed in git. The URL that Chris posted explains a little of the _why_, but not all. It just said that they made the mergetool better, but it didn't explain how the new way was better. What the git developers did was to change the mergetool command that diffs the various versions of the file being merged. They used to start the command with "vim -f -d ...", which started vim in diff mode so that &diff was 1 when vimrc was sourced. They changed the command to start with "vim -f -c 'echo | ..." and somewhere in that command they execute diffthis in a loop. Consequently, that command does not put vim into diff mode when it starts and vimrc is sourced when &diff is 0. It is not clear at all to me why someone thought the new mergetool command was in some way better than the old one. The problem is solely due to the change made in git. I thought that the mergetool command was documented somewhere in the git documentation, but I haven't looked for it in a long while. You _might_ find some explanation for the change in the git mailing list archives or in the git log of the git repository, but not all developers explain their reasoning very well. The git mailing list would be the place to ask about this. Regards, Gary -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/20220818050631.GC6741%40phoenix.
