Initial commit to add default .gitIgnore and .gitAttribute files.
123
Done
New1 Change
master1
Resolve conflict
Done conflict
change master
change new1
Done
New 1 Change
master change
resolve
Done
12
12
2.0
1.1
Commit
Merge https://github.com/bigbulu/TestFile