Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:11:08 +0000 (14:11 -0700)
commit6b7242aa1acc3c7835f80522914ffc4b2e789a29
tree319c8612f1ed189bd99fd858c20a9de3a1004f77
parent200e7fbbac82b6665f8175af0e375fbef3568c30
parentd6e8149bc53de57cab7cc0d9aff6c2341f3a7efa
Merge with gitk.

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

Sincerely,
    jit-merge command.