Somehow I screwed up and broke make check while at it :-/
Signed-off-by: Daniel Vetter <[email protected]>
---
drm-tip.rst | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drm-tip.rst b/drm-tip.rst
index b09a108da32d..80089f078bb4 100644
--- a/drm-tip.rst
+++ b/drm-tip.rst
@@ -128,10 +128,6 @@ best way to go about this is:
$ git diff | dim cat-to-fixup
-
-Anytime you add or change a manual merge fixup please inform the maintainers of
-both involved trees so that they are aware of the situation and can consider
-resolving the conflict permantly with a backmerge or pull.
3. Finally rebuild the integration tree, which should now go through
smoothly, at least for this merge::
--
2.20.0.rc1
_______________________________________________
dim-tools mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dim-tools
