![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 25 Jul 2007 07:44:50 +0000 (03:44 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 25 Jul 2007 08:23:31 +0000 (04:23 -0400) | ||
| commit | 350a35f0a17af071af3f6f76d9fc6f63265b23d2 | |
| tree | 12c31be0865285ef0351f4a03a6c728d9f889c4c | tree | snapshot |
| parent | becafaace69980d2980802432e86e7873317a4b6 | commit | diff |
git-gui: Replace merge dialog with our revision picker widget
Now that we only support merging one branch we can offer the user
a better user interface experience by allowing them to select the
revision they want to merge through our revision picking widget.
This change neatly solves the problem of locating a branch out of
a sea of 200 tracking branches, and of dealing with very long branch
names that all have a common prefix.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Now that we only support merging one branch we can offer the user
a better user interface experience by allowing them to select the
revision they want to merge through our revision picking widget.
This change neatly solves the problem of locating a branch out of
a sea of 200 tracking branches, and of dealing with very long branch
names that all have a common prefix.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/merge.tcl | diff | blob | history |