Unclear whether dim co or plain cd was meant, suggested by Chris.
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
---
drm-intel.rst | 1 +
1 file changed, 1 insertion(+)
diff --git a/drm-intel.rst b/drm-intel.rst
index 6771bed6654e..492cb580bbd5 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -248,6 +248,7 @@ when it's tricky or something fails in the below procedure.
3. Switch to $DIM_PREFIX/drm-intel-nightly and analyze the conflict: ::
+ $ cd $DIM_PREFIX/drm-intel-nightly
$ git diff # shows three-way diff of conflict
$ gitk --merge # lists all commits git believes to be relevant
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
