Add decision
Write MERGE_HEAD when merging
Do merge message via MERGE_MSG file
Merge: write merge idx, then write tree from it

* Instead of having special fn to create tree structure for merge