git/git-gui/lib/diff.tcl, branch v1.5.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v1.5.22007-05-08T03:51:00ZMerge branch 'master' of git://repo.or.cz/git-gui2007-05-08T03:51:00ZShawn O. Pearcespearce@spearce.org2007-05-08T03:36:31Zurn:sha1:5f5dbd719d0d8ec136f32a0a56674902bd85f72f
* 'master' of git://repo.or.cz/git-gui:
git-gui: Use vi-like keys in merge dialog
git-gui: Include commit id/subject in merge choices
git-gui: Show all possible branches for merge
git-gui: Move merge support into a namespace
git-gui: Allow vi keys to scroll the diff/blame regions
git-gui: Move console procs into their own namespace
git-gui: Refactor into multiple files to save my sanity
git-gui: Track our own embedded values and rebuild when they change
git-gui: Refactor to use our git proc more often
git-gui: Use option database defaults to set the font
git-gui: Cleanup common font handling for font_ui
git-gui: Correct line wrapping for too many branch message
git-gui: Warn users before making an octopus merge
git-gui: Include the subject in the status bar after commit
Also perform an evil merge change to update Git's main Makefile to
pass the proper options down into git-gui now that it depends on
reasonable values for 'sharedir' and 'TCL_PATH'.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>