Added d to branch f2.
Added another line to a in branch f2.  There are now two lines in a.
Merge branch 'f2' into dev