]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e8a00a a2dc04b)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
* maint:
  diff -c -p: do not die on submodules

Conflicts:
combine-diff.c

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

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