* Add History type and merge-commit model to graph-storage
* Add History::merge with canonical-sort convergence to graph-storage
* Append merge delta without re-sorting the whole history
* Resurrect across merges by searching all ancestors, not the primary chain
