Re: [PATCH 0/7] [doc] Add new page on merge conflicts

I think that is giving us a good signal, though. The guide should be
mentioned in command-list.txt, so that it is linked from git(1).

Thanks, will fix this (and will move the conflict-marker-size change).

Should I be trying to apply my patches to `seen` before submitting them?

- Julia