mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typo 

Co-authored-by: Noah Lev <camelidcamel@gmail.com>
This commit is contained in:
Joshua Nelson 2022-12-31 17:51:12 -06:00
parent 3093967547
commit 3b35c4e040
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/git.md
View File

@ -140,7 +140,7 @@ You might also notice conflicts in the web UI:
The most common cause is that you rebased after a change and ran `git add .` without first running The most common cause is that you rebased after a change and ran `git add .` without first running
`x.py` to update the submodules. Alternatively, you might have run `cargo fmt` instead of `x fmt` `x.py` to update the submodules. Alternatively, you might have run `cargo fmt` instead of `x fmt`
and modified files in a submodule, then commited the changes. and modified files in a submodule, then committed the changes.
To fix it, do the following things: To fix it, do the following things: