Skip to content

S
Svn-to-Git
Commit 7178208c authored by 王进波's avatar 王进波
Browse files
Options

update

parent 6ae201b6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
doc/使用Vimdiff解决git冲突.md
View file @ 7178208c
...@@ -22,7 +22,7 @@ git config mergetool.prompt false ...@@ -22,7 +22,7 @@ git config mergetool.prompt false
## 创造合并冲突 ## 创造合并冲突
我们来创建一个测试环境。你可以自由选择调过这部分或者跟着教程来做。 我们来创建一个测试环境。你可以自由选择跳过这部分或者跟着教程来做。
``` ```
mkdir zoo mkdir zoo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment