Archives
Archives
| From: | Matt Turner <mattst88@g.o> | ||
|---|---|---|---|
| To: | gentoo development <gentoo-dev@l.g.o> | ||
| Subject: | Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... | ||
| Date: | Tue, 02 Mar 2021 18:54:27 | ||
| Message-Id: | CAEdQ38H=mnqk+hszw4swK1PxOzbB+Vy=fd8Pw5XbwFh8aJED3w@mail.gmail.com | ||
| In Reply to: | Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=... by "Wolfgang E. Sanyer" |
||
| 1 | On Tue, Mar 2, 2021 at 6:11 AM Wolfgang E. Sanyer |
| 2 | <wolfgangesanyer@×××××.com> wrote: |
| 3 | > Git diff has --color-word, doesn't this suggest that it has the capability of identifying these word-by-word changes? |
| 4 | |
| 5 | No, git diff has that feature. That doesn't imply that the default |
| 6 | merge driver has that feature. |
| 7 | |
| 8 | > Is there perhaps a merge option that is being overlooked? |
| 9 | |
| 10 | At least not one the upstream git developers know about. (I asked) |