From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 17:41:09 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.7.4-rc0~155
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06cfa8a8589740b9dd4820ad1c2eff4b3d968de7;p=git.git

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

* 'master' of git://repo.or.cz/git-gui:
  git-gui: apply color information from git diff output
  git-gui: use wordprocessor tab style to ensure tabs work as expected
  git-gui: correct assignment of work-tree
  git-gui: use full dialog width for old name when renaming branch
  git-gui: generic version trimming
  git-gui: enable the Tk console when tracing/debugging on Windows
  git-gui: show command-line errors in a messagebox on Windows
  On Windows, avoid git-gui to call Cygwin's nice utility
---

06cfa8a8589740b9dd4820ad1c2eff4b3d968de7