Skip to content

update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yangyanglixiao wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30d3cf2
添加测试
yangyanglixiao Mar 15, 2017
814a514
添加忽略添加
yangyanglixiao Mar 15, 2017
4d60944
c
yangyanglixiao Mar 15, 2017
6f7b5ec
delete
yangyanglixiao Mar 15, 2017
f4fa295
添加忽略规则
yangyanglixiao Mar 16, 2017
8830321
ceshi
yangyanglixiao Mar 16, 2017
6639ca6
完成测试
yangyanglixiao Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
*.egg-info
dist
build
*.pub
inspur


4 changes: 4 additions & 0 deletions 1232.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<<<<<<< Updated upstream
=======
测试的 合并成功
>>>>>>> Stashed changes
1 change: 1 addition & 0 deletions head.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test1