Code

Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Mon, 8 Aug 2005 00:10:20 +0000 (17:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 Aug 2005 00:10:20 +0000 (17:10 -0700)
commitd59a6043a8a7aed97c684fb4f14fe5221df1fcaf
treed6685b2c39050f02b629f706728dbf86f59414f8
parent6b7242aa1acc3c7835f80522914ffc4b2e789a29
parentfa4da7b32e1197fa5032db6a2de7749868253f8b
Merge with gitk.

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

Sincerely,
    jit-merge command.