From: Junio C Hamano <junkio@cox.net>
Date: Fri, 12 Aug 2005 01:24:35 +0000 (-0700)
Subject: Merge with gitk.
X-Git-Tag: v0.99.5~24^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b64f88f09ae2169ec85652b46897574e352936d;p=git.git

Merge with gitk.

This merges commit
    b664550c066810b770ad3e19cafe2fbdd42c6793
from gitk into our head commit
    bf570303153902ec3d85570ed24515bcf8948848

Sincerely,
    jit-merge command.
---

2b64f88f09ae2169ec85652b46897574e352936d