From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Sep 2008 23:03:22 +0000 (-0700)
Subject: Merge branch 'maint' of git://repo.or.cz/git-gui into maint
X-Git-Tag: v1.6.0.2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b118da8bd1878d78589afd9f755b9d52a9579ad;p=git.git

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Fix diff parsing for lines starting with "--" or "++"
  git-gui: Fix string escaping in po2msg.sh
  git gui: show diffs with a minimum of 1 context line
  git-gui: update all remaining translations to French.
  git-gui: Update french translation
---

1b118da8bd1878d78589afd9f755b9d52a9579ad