steakhal 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)). :) https://github.com/llvm/llvm-project/pull/154608 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
