From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 27 Jun 2007 04:36:38 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~44^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03d25622a5c0f8d0fc4030f3114974d86f20fd61;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
  git-gui: Don't nice git blame on MSYS as nice is not supported
  git-gui: Don't require $DISPLAY just to get --version
---

03d25622a5c0f8d0fc4030f3114974d86f20fd61