new dog
dog2
new file in master
-m
-m
file on master 2
Merge branch 'cat'

* cat:
  -m
  -m
Merge branch 'dog'

* dog:
  dog2
  new dog