`systrunk status -d` will now display a shortdiff in the status output.
This is off by default since worktrees for system drives probabally
won't want it all the time.

Needed to rework how I was handling conflicting files w.r.t. interactive
prompts.  As it turns out, piping in find to the containing while loop
was cutting-off standard in from getting to the interactive read
prompts.

Files were being suffixed with extra characters.

Setup for prebaked commit message and merge-commit meta-data.

This is to prevent those functions from overwriting variables used by
the merge function.