project-branch-stack: only show diff for conflicts
alias bum: supply *.bak suffix if user forgot to