From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 20:18:11 +0000 (-0700)
Subject: Merge with gitk.
X-Git-Tag: v0.99.4~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e8c80638abc99928dba9ac832589749a531e2e21;p=git.git

Merge with gitk.

This merges commit
    466e4fdd6696c89700294e1a54fa73e1fb94643b
from gitk into our head commit
    ef0bd2e6e643f09a8294937caf99463328b9215a

Sincerely,
    jit-merge command.
---

e8c80638abc99928dba9ac832589749a531e2e21