y
add ignore
2
add folder
a;
a
Merge branch 'master' of github.com:tyrantgit/repo1