Age | Commit message (Expand) | Author |
---|---|---|
2017-12-22 | merge-recursive: avoid incorporating uncommitted changes in a merge | Elijah Newren |
2017-12-22 | t6044: recursive can silently incorporate dirty changes in a merge | Elijah Newren |
2016-05-30 | Merge branch 'js/t6044-use-test-seq' | Junio C Hamano |
2016-05-18 | t6044: replace seq by test_seq | Johannes Sixt |
2016-04-13 | t6044: new merge testcases for when index doesn't match HEAD | Elijah Newren |
2016-04-13 | merge-octopus: abort if index does not match HEAD | Elijah Newren |