]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7768e27 b507b46)
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (21:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Oct 2006 04:28:12 +0000 (21:28 -0700)
* maint:
  git-apply: prepare for upcoming GNU diff -u format change.

1  2 
builtin-apply.c patch | diff1 | diff2 | blob | history

diff --cc builtin-apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.