Merge branch 'maint'
[git] / t / t7405-submodule-merge.sh
2009-04-08  Junio C HamanoMerge branch 'ms/http-auth'
2009-04-08  Junio C HamanoMerge branch 'js/maint-submodule-checkout'
2009-04-08  Junio C HamanoMerge branch 'cb/maint-merge-recursive-submodule-fix'
2009-04-05  Clemens Buchacherupdate cache for conflicting submodule entries
2009-04-05  Clemens Buchacheradd tests for merging with submodules