[crac] RFR: Merge jdk:jdk-24+27
Dmitry Cherepanov
dcherepanov at openjdk.org
Mon Feb 10 12:05:21 UTC 2025
On Wed, 22 Jan 2025 11:52:41 GMT, Anton Kozlov <akozlov at openjdk.org> wrote:
> May I suggest to supply output of
>
> ```
> echo -e '<details>\n\n<summary>Conflicts</summary>\n\n```diff'
> git -c merge.conflictstyle=diff3 show --diff-merges=remerge $1
> echo -e '```\n\n</details>'
> ```
>
> The merge conflict resolution is a bit easier to review with 3-way diff and syntax highlighting.
Thanks for the suggestion. Attached output of 3-way diff.
-------------
PR Comment: https://git.openjdk.org/crac/pull/188#issuecomment-2647783636
More information about the crac-dev
mailing list