[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edee414 c35a7b8)
Merge with master.
authorJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 07:10:18 +0000 (00:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 10 Aug 2005 07:10:18 +0000 (00:10 -0700)
This merges commit
    c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
    edee414c3e5a546aae3dd1529f397df949713305

Sincerely,
    jit-merge command.

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

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