From: Junio C Hamano <junkio@cox.net>
Date: Sat, 6 Aug 2005 16:24:15 +0000 (-0700)
Subject: Merge with gitk.
X-Git-Tag: v0.99.4~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f81fc82743ccd4fd7157f1f1db41605eb018fb9;p=git.git

Merge with gitk.

This merges commit
    d698206c12a4680a92c5f4894f0345dc7dcfe62a
from gitk into our head commit
    2c6e4771959dbe8116f39587d912f1215c06cd0d

Sincerely,
    jit-merge command.
---

3f81fc82743ccd4fd7157f1f1db41605eb018fb9