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

Merge with gitk.

This merges commit
    d6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
from gitk into our head commit
    200e7fbbac82b6665f8175af0e375fbef3568c30

Sincerely,
    jit-merge command.
---

6b7242aa1acc3c7835f80522914ffc4b2e789a29