branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
dev work have finished
merge 1.1 work
try man
try and try
conflict try and try
trash work
feature try
merge feature try
last try
ok last try
ok last merge
master nn