REVIEW: Reference counting of index conflict
WIP: Commit as email
WIP: Commit -> diff()