aboutsummaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
Commit message (Expand)AuthorAge
* merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-22
* t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-22
* Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-29
|\
| * t6044: replace seq by test_seqJohannes Sixt2016-05-18
* | merge-octopus: abort if index does not match HEADElijah Newren2016-04-12
|/
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-12