[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a164d4 1a9eb3b)
Merge branch 'jc/diff-apply-patch'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 03:18:16 +0000 (19:18 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 03:18:16 +0000 (19:18 -0800)
* jc/diff-apply-patch:
  git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Git - the stupid content tracker