add edit by joseph
rm a.txt
init a.txt
update a.txt
add b.txt
Revert "update a.txt"

This reverts commit 8f1551c739bfa84b0f6beac772c500b8bb95d21a.
update a.txt to 3
resolve conflict
update a.txt
add c.txt
update a to 100
update a to 111
update a.txt
update a to 100
add d.txt
Merge branch 'master' of github.com:josephjsf/myAndroidProj