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)
* maint:
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line

Conflicts:
lib/option.tcl

No differences found