commit readme.txt in branch dev
modified readme.txt
modify files in master
conflict fixed
commit 2.txt
master commit 2.txt
add 2.txt
add 3.txt
merge with no-ff
add 3.txt
add 3.txt
merge from issue-101
add 4.txt