Code

Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Sat, 6 Aug 2005 16:24:15 +0000 (09:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 6 Aug 2005 16:24:15 +0000 (09:24 -0700)
This merges commit
    d698206c12a4680a92c5f4894f0345dc7dcfe62a
from gitk into our head commit
    2c6e4771959dbe8116f39587d912f1215c06cd0d

Sincerely,
    jit-merge command.


Trivial merge