branch b1 modi zdz3.txt
modi zdz3.txt on branch b2
modi zdz3.txt on branch master
conflict fixed
add 1 line one b3
merge with no-ff
master commit
add 1 line on master on zdz3.txt