global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 09:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
f2216d6493fdcad2bca3e159e00f225df6488b21
git/merge-recursive.c
Junio C Hamano 2149e0f6a6 Merge branch 'cb/maint-merge-recursive-submodule-fix' 
* cb/maint-merge-recursive-submodule-fix:
  simplify output of conflicting merge
  update cache for conflicting submodule entries
  add tests for merging with submodules
2009-04-07 22:32:56 -07:00

37 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink