Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 1 Sep 2008 22:39:56 +0000 (15:39 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 1 Sep 2008 22:39:56 +0000 (15:39 -0700)
commit961a628fdd79a30188b0f76be98b3c1db8e13389
tree9703c203a5a6006bc4c0ccb2a19ccda1cfd807b5
parentf7078b40917daa20ea3fa54c7e38766594e4b996
parent9dc3793166db8f3b80b909e2cb3ac3c5d0a611d5
Merge branch 'maint'

* maint:
  git-gui: Fix string escaping in po2msg.sh
  git gui: show diffs with a minimum of 1 context line

Conflicts:
lib/option.tcl
git-gui.sh
lib/option.tcl