addfile
addsblack.txt
modify sblack.txt
made a file change
add a master change
emergency modify
modify by sblack.txt
merge conflict sblack.txt