From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 17:21:09 +0000 (-0700)
Subject: Merge with gitk.
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda;p=~andy%2Fgit

Merge with gitk.

This merges commit
    b1ba39e7e80cdee3e7c1c80334cd9aa87b9b7b69
from gitk into our head commit
    93b5fcdd8ddaa7f55ce1a43d8b9eaed1d5febc98

Sincerely,
    jit-merge command.
---

f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda