Age | Commit message (Expand) | Author | Files | Lines |
2019-05-14 | tests: add a special setup where prerequisites fail | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
2018-07-11 | t7405: verify 'merge --abort' works after submodule/path conflicts | Elijah Newren | 1 | -0/+31 |
2018-07-11 | t7405: add a directory/submodule conflict | Elijah Newren | 1 | -0/+88 |
2018-07-11 | t7405: add a file/submodule conflict | Elijah Newren | 1 | -0/+54 |
2017-10-07 | tests: fix diff order arguments in test_cmp | Stefan Beller | 1 | -1/+1 |
2011-10-13 | submodule: Search for merges only at end of recursive merge | Brad King | 1 | -1/+1 |
2011-10-13 | submodule: Demonstrate known breakage during recursive merge | Brad King | 1 | -0/+51 |
2011-03-30 | submodule: process conflicting submodules only once | Nicolas Morey-Chaisemartin | 1 | -6/+52 |
2010-09-03 | t7405: cd inside subshell instead of around | Jens Lehmann | 1 | -11/+6 |
2010-07-07 | Implement automatic fast-forward merge for submodules | Heiko Voigt | 1 | -6/+122 |
2010-07-06 | add missing && to submodule-merge testcase | Heiko Voigt | 1 | -1/+1 |
2009-04-29 | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 1 | -3/+3 |
2009-04-05 | update cache for conflicting submodule entries | Clemens Buchacher | 1 | -1/+1 |
2009-04-05 | add tests for merging with submodules | Clemens Buchacher | 1 | -0/+74 |