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

Merge with gitk.

This merges commit
    fa4da7b32e1197fa5032db6a2de7749868253f8b
from gitk into our head commit
    6b7242aa1acc3c7835f80522914ffc4b2e789a29

Sincerely,
    jit-merge command.
---

d59a6043a8a7aed97c684fb4f14fe5221df1fcaf