Commit README
readme.txt
commit readme.txt
commit master branch of readme.txt
confilct fixed
3 commit
merger with --no-ff
commit at branch issue-101
mergeed bug fix 101