Use multi-line text fields for merge and rebase result dialogs