projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42a3d82
)
docs/submittingpatches: Fix confusing typo + missing pronoun
author
Dylan Baker
<dylan@pnwbakers.com>
Thu, 5 Mar 2020 18:49:51 +0000
(10:49 -0800)
committer
Marge Bot
<eric+marge@anholt.net>
Thu, 5 Mar 2020 22:47:28 +0000
(22:47 +0000)
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4066>
docs/submittingpatches.html
patch
|
blob
|
history
diff --git
a/docs/submittingpatches.html
b/docs/submittingpatches.html
index 9113e417009a60dd5fa315cb3cbe120f35d2749a..7378dda6b830bb3cd51ed3a526575f7c79f8ac3a 100644
(file)
--- a/
docs/submittingpatches.html
+++ b/
docs/submittingpatches.html
@@
-386,7
+386,8
@@
yourself warned.
<p>
By default merge conflicts are resolved by the stable-release manager. The
release maintainer should resolve trivial conflicts, but for complex conflicts
-should ask the original author to provide a backport of de-nominate.
+they should ask the original author to provide a backport or de-nominate the
+patch.
</p>
<p>