text changed
new branch commit
new commit
intersting commit1
fix merge