diff options
| author | Benedict Reuschling <bcr@FreeBSD.org> | 2023-12-29 12:28:20 +0000 |
|---|---|---|
| committer | Benedict Reuschling <bcr@FreeBSD.org> | 2023-12-29 12:28:20 +0000 |
| commit | 019719eb085172ae2dcf150b50fc467c66331347 (patch) | |
| tree | ef20be952aee1ce54fa8651d3ded5a3f941018da /documentation/content/en/articles/committers-guide/_index.adoc | |
| parent | 08408fe0c9676ff7d66d40b106b43c00773be655 (diff) | |
Diffstat (limited to 'documentation/content/en/articles/committers-guide/_index.adoc')
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 6caa7d6bf4..9204c649a9 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -816,7 +816,7 @@ That is OK. Do not panic. Instead, handle them the same as any other merge conflicts. To keep it simple, I will just describe a common issue that may arise. -A pointer to a more complete treatment can be found at the end of this section. +A pointer to a complete treatment can be found at the end of this section. Let's say the includes changes upstream in a radical shift to terminfo as well as a name change for the option. When you updated, you might see something like this: |