From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Aug 2010 22:20:01 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=721e76cbfac650ce676fc789b717eb21e1daa46e;p=git.git

Merge branch 'maint'

* maint:
  contrib/svn-fe: Add the svn-fe target to .gitignore
  contrib/svn-fe: Fix IncludePath
  Fix DIFF_QUEUE_CLEAR refactoring
  git-gui: fix size and position of window panes on startup
  git-gui: mc cannot be used before msgcat has been loaded
  git-gui: use textconv filter for diff and blame
  git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
  git-gui: fix shortcut creation on cygwin
  git-gui: fix PATH environment for mingw development environment
  git-gui: fix usage of _gitworktree when creating shortcut for windows
  git-gui: fix "Explore Working Copy" for Windows again
  git-gui: fix usage of themed widgets variable
  git-gui: Handle failure of core.worktree to identify the working directory.
  git-gui: check whether systems nice command works or disable it
---

721e76cbfac650ce676fc789b717eb21e1daa46e