Merge branch 'maint'
commit71a9db534a6bb4a6e9824c01b557a96ccaae0e89
authorShawn O. Pearce <spearce@spearce.org>
Fri, 1 Jun 2007 03:34:24 +0000 (31 23:34 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 1 Jun 2007 03:34:24 +0000 (31 23:34 -0400)
tree8ab2a8437233dd6591593672d6e18d57d5cee43c
parenta1388cf0361b133deaba5266211a34bdec66b7cc
parentb8848f7753762ff8c4e34b3c15e788c5f7e6781f
Merge branch 'maint'

* maint:
  git-gui: Allow as few as 0 lines of diff context
git-gui.sh
lib/option.tcl