create the file named test3.txt
delete test3.txt
modified test2.txt
changed the test2.txt
have changed test2.txt
changed test2.txt
changed test2.txt
test2.txt
do the conflict
Update test2.txt
test2.txt renew
test2.txt renew
Update test2.txt
changed test3.txt
Update test2.txt
changed test2.txt
I have done the debug
merge bug fix 101