Add todo
Add decision
Use new intersection fn
First crack at three-way merge
Add some basic tests for three-way merge
Clarify three-way merge code a bit
Verify merge hash as extra check
Test can pass hash when fast-forward merging
Test can pass hash when three-way merging
Test merge commit messages
Better test group description
Bit weird to only test merge commit in this test - test elsewhere
Test three-way merge points HEAD at merge commit
Test three-way merge points branch at merge commit
Put repeated pre-simple-merge tree setup into beforeEach
Separate out tests for basic results of three-way merge
Test file rmed from merge commit if was rmed from merge giver