use ddr-cmdln's refactored repo status flag functions
separate commit function for diverged repos

Not sure we need this actually, but there it is.  We can remove it
later if we need to.
repo status cache timeout > zero (e.g. don't cache)

Repo synced/ahead/behind/diverged status was taking way too long
to update, so just set timeouts to zero.
merge view commits; UI touch-ups of merge-index

The merge-index view can now do the commit operation after files
are resolved and added.
Page UI was pretty confusing and has been cleaned up.
Moved status and diagnostic info to bottom.
shuffled the repo status pills around; fixed display logic

"conflicted" status logic is now separate from the
"ahead/behind/diverged" logic.
A repo can now be conflicted *and* ahead/behind/diverged.
update "conflicted collection" alert with link to merge-index

Make it possible for users to get to the merge-index page
without having to know the URI.