Re: [PATCH v3] doc: git-diff: rewrite EXAMPLES section

[Junio C Hamano <gitster@pobox.com>]

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Julia Evans <julia@jvns.ca>
>
> The top piece of feedback users always give about man pages is always
> that they want better examples that are relevant to them.
>
> The EXAMPLES section's structure has remained mostly unchanged since
> 2007, which was before we knew how people were going to use `git diff`.
> Update it with ways of using `git diff` that are popular with Git
> users, gathered by asking Mastodon users for their most commonly used
> incantations. Keep the example that was added since 2007
> (`git diff AUTO_MERGE`), rewording it to use the more familiar term
> "merge conflict" instead of "textual conflict".

Thanks.  Will replace.