Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 8 Apr 2009 14:41:13 +0000 (07:41 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 8 Apr 2009 14:41:13 +0000 (07:41 -0700)
commit4339d5109c847fc938cd8405001ffde4d230c09f
treee55511718d7d17fb939e398f3cdd17c0e25fa9df
parentb01d4326040ec6b9d98baba32091c9458fc809d4
parentfb25092a88ba889f540beaf9acdb208421ce2a20
Merge branch 'maint'

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