[MERGE] trivial patch for show_pending_merge(short=True)

[Alexander Belchenko]

`bzr status --short` shows pending merges slightly incorrectly:
it tries to fit line log of pending revisions exactly to terminal width
and therefore when line is truncated another blank line is appear after
that line. This trivial patch shrink the terminal width by 1 symbol,
so blank line should not appear anymore. The same approach used in
`bzr log --line`.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: status.short.pending.merges.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080124/372f6d3f/attachment.diff