projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d65279d 39d8e27)
Merge branch 'cb/maint-merge-recursive-submodule-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:32:56 +0000 (22:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:32:56 +0000 (22:32 -0700)
* cb/maint-merge-recursive-submodule-fix:
  simplify output of conflicting merge
  update cache for conflicting submodule entries
  add tests for merging with submodules

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

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