Link to Git guide in rustc-dev-guide on merge conflicts#103

Mark-Simulacrum merged 1 commit intorust-lang:masterrust-lang/homu:masterfrom

camelid:link-to-git-guidecamelid/homu:link-to-git-guideCopy head branch name to clipboard