better `but base update` output

[schacon]

output what actually happened:

• integrated branches removed
• conflicts introduced
• commits integrated
• rebased or merged

but base check should show what will happen, but base update should say what it actually did and how to undo it.