[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3958a7 f10e0e0)
Merge with master.
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)
This merges commit
    f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
    c3958a7926ab20b90fe0767580b466698477f5b6

Sincerely,
    jit-merge command.

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Git - the stupid content tracker