From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Oct 2007 03:41:20 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.4-rc0~333
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6e863d6d129a1b6a13c66d0bb03f3d43db6c51fe;p=git.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix "can't unset prevlines(...)" Tcl error
  gitk: Avoid an error when cherry-picking if HEAD has moved on
  gitk: Check that we are running on at least Tcl/Tk 8.4
  gitk: Do not pick up file names of "copy from" lines
  gitk: Add support for OS X mouse wheel
  gitk: disable colours when calling git log
---

6e863d6d129a1b6a13c66d0bb03f3d43db6c51fe