On Sat, May 6, 2023 at 4:40 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Fri, May 5, 2023 at 6:58 AM Adam Johnson via GitGitGadget > <gitgitgadget@xxxxxxxxx> wrote: > > [...] > Everywhere else in the manual we have referred to these as "conflict > markers", not "merge markers". [...] > If we're updating this documentation, perhaps it's time to drop the > mention of RCS? [...] > I dislike the whole "yours" & "theirs" thing. [...] I'm happy to see > them used one less place here. [...] > "Using real values" [...] seems more likely to confuse them than using a > descriptive term or even a fake hash (such as "aaaaaaa"). [...] > The comment you added here about zdiff3 is correct in context, [...] I realized I also failed to note that I like the patch in general and think it has some good cleanups, even if there are potential further improvements to make. Looking forward to your reroll.
