From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 8 Apr 2009 14:41:13 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc4~1^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4339d5109c847fc938cd8405001ffde4d230c09f;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Ensure consistent usage of mergetool.keepBackup
  git-gui: fix use of undeclared variable diff_empty_count
---

4339d5109c847fc938cd8405001ffde4d230c09f