[llvm-branch-commits] [clang] Move rest of documentation problems that found their way to the SA section (PR #154608)
Erich Keane via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Thu Aug 21 05:58:25 PDT 2025
erichkeane wrote:
> > > Dammit, yeah I wish I could still see the conflict to work out how I misread it - I suspect the addition of "A new flag - `-static-libclosure`..." to new flags didn't conflict :-/
> >
> >
> > You can actually, `git show --remerge-diff 30401b1f918ea359334b507a79118938ffe3c169` ([docs](https://git-scm.com/docs/git-show#Documentation/git-show.txt---remerge-diff)). :)
>
> I think this was a pebkac issue with me using the GH editor to resolve the diff - if I merge locally the change seems obvious, and I can't think of a reason to make this error.
Thank you so much for fixing this :) I appreciate your help!
https://github.com/llvm/llvm-project/pull/154608
More information about the llvm-branch-commits
mailing list