[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd5fff6 a20b4d8)
Merge branch 'jn/conf'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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