当发生冲突时,为什么移动的代码不在git diff中着色?

当发生冲突时,为什么移动的代码不在git diff中着色?,git,git-diff,Git,Git Diff,这个问题属于 但在这里,我在执行cherry pick时遇到合并冲突: On branch dev You are currently cherry-picking commit 46b48c5b. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel

这个问题属于

但在这里,我在执行cherry pick时遇到合并冲突:

On branch dev
You are currently cherry-picking commit 46b48c5b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
1   both modified:   lib/Mojolicious/Plugin/OpenAPI3.pm



我认为区别在于3路差异和简单2路差异所使用的着色规则。不过,除此之外,我真的不能说
$ git --version
git version 2.26.0