Commit index.html in branch2 spawned from master.
Added div branch2 to isolated branch2 additions
Added div branch2 to isolated branch2 additions, with class distinct2
Added div branch2 to isolated branch2 additions, with class distinct2.
"Manually" resolved vs branch1 additions because NetBeans diff clashed them.
Merge commit '42d5af1fa839cb2f800e5422a46a4aeb0ef12c4f'

Conflicts: 
  index.html

Conflicts resolved "by hand", diff could not detect DIVs from branch1, stashme, and branch2 cleanly.