Code review comment for lp:~gz/bzr/conflicts_non_ascii_ui_686161

Trying to finish this quickly to land on the last day was a bad idea. :)

I've gone back a few revisions and cleaned up some dumb mistakes and will try on PQM again, and repropose if it still runs into problems.