Test command git -a
cc1 has been add in another repo, commit it to trigger a conflict.
Merge branch 'master' of https://github.com/arrizo7/for_test
confict
Resolve confilct.