[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f29eaed 6b7242a)
Merge with master.
authorJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (14:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 Aug 2005 21:12:38 +0000 (14:12 -0700)
This merges commit
    6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
    f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
    jit-merge command.


Trivial merge
Git - the stupid content tracker