Age | Commit message (Expand) | Author |
---|---|---|
2009-04-30 | merge-recursive: do not die on a conflicting submodule | Junio C Hamano |
2009-04-05 | update cache for conflicting submodule entries | Clemens Buchacher |
2009-04-05 | add tests for merging with submodules | Clemens Buchacher |