tree a0d153c1e578d4746ee9456d2d73d4900b378771
parent 349f92e3a25216b6f79c58044d74b61c89de20b8
author Shawn O. Pearce <spearce@spearce.org> 1178230899 -0400
committer Shawn O. Pearce <spearce@spearce.org> 1178595352 -0400

git-gui: Include commit id/subject in merge choices

When merging branches using our local merge feature it can be
handy to know the first few digits of the commit the ref points
at as well as the short description of the branch name.

Unfortunately I'm unable to use three listboxes in a row, as Tcl
freaks out and refuses to let me have a selection in more than
one of them at any given point in time.  So instead we use a
fixed width font in the existing listbox and organize the data
into three columns.  Not nearly as nice looking, but users can
continue to use the listbox's features.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>