- need an upgrade story; srv needs more versions
- need a story about install/ contrib/
+- Give users a "certificate" of their merge, which they can
+ use to reuse that merge commit if something unrelated fails.
+
- Human readable quota output
- Nice error message on --continue if you forgot to git add your
resolved file (look for conflict markers)