From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 1 Sep 2008 22:39:56 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~270^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/961a628fdd79a30188b0f76be98b3c1db8e13389?hp=961a628fdd79a30188b0f76be98b3c1db8e13389

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
---